am c9869057: am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."

* commit 'c98690576ab6d7d13e5c0d3387db8149de71d9de':
  Avoid redefinition of  __STDC_FORMAT_MACROS.
This commit is contained in:
Ian Rogers 2014-01-31 16:41:11 +00:00 committed by Android Git Automerger
commit f312814060
1 changed files with 0 additions and 1 deletions

View File

@ -21,7 +21,6 @@
#include <sys/types.h>
#include <unistd.h>
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include <string>