tree 2938d2b92b346fa1ad13b4f803f0a4666dd456c8
parent 956cd054683308b3de25401e64dfc8abda795de9
parent 7495e68a61075ef592aff6f2ba4d1d06fe3fedf4
author Ben Cheng <bccheng@google.com> 1392036655 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392036655 +0000

am 7495e68a: am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"

* commit '7495e68a61075ef592aff6f2ba4d1d06fe3fedf4':
  Refreshed gcc predefines __ANDROID__