tree 63b62580a8f167fa1e7b0a0eb1859d6c4277e768
parent 0edbf89e687802d4c92fb8b81af1a0715017aa8f
parent 479ce0c1f3d9ecbaf7947651a5e00828ec522f15
author Brian Carlstrom <bdc@google.com> 1412124775 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412124775 +0000

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

* commit '479ce0c1f3d9ecbaf7947651a5e00828ec522f15':
  Fix mac build for nativebridge tests.