tree b9cdeec9bf36bf9c29dbe34971c366f28d85d7a5
parent 7d6aed2c77ccc1de6716da6fc8db7838f21e4022
parent c98690576ab6d7d13e5c0d3387db8149de71d9de
author Ian Rogers <irogers@google.com> 1391186471 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391186471 +0000

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

* commit 'c98690576ab6d7d13e5c0d3387db8149de71d9de':
  Avoid redefinition of  __STDC_FORMAT_MACROS.