tree 91bf252c72da06a1ff2eb958f0f6d0d3a48dab4e
parent ada485e38c5c9944c173bcb569c6841c2fb6d5f0
parent 5a0f0e97109b1558df0bc04940525f477f4db356
author Brian Carlstrom <bdc@google.com> 1412127814 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412127814 +0000

am 5a0f0e97: am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-dev

* commit '5a0f0e97109b1558df0bc04940525f477f4db356':
  Fix mac build for nativebridge tests.