tree 6fb5d2941e25452d8e35d4d635795ad05963f91a
parent 4f2015a155175f9da36574a378ce15ed74027ae9
parent 615af25ffdde99331c173499446e08c3a7ec32a8
author Elliott Hughes <enh@google.com> 1440551670 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440551670 +0000

am 615af25f: am a421c1e5: Merge "Possible Mac build fix."

* commit '615af25ffdde99331c173499446e08c3a7ec32a8':
  Possible Mac build fix.