tree c249f9615abe52912cd4a2960423d0654ed22a37
parent 9c970bd926da8f71daad801de96460edb55b69c7
parent 68c19686e8f9b5a88e3b2729a453d03516be79f1
author Andreas Gampe <agampe@google.com> 1412023684 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412023684 +0000

am 68c19686: Merge "Fix mac build for nativebridge tests."

* commit '68c19686e8f9b5a88e3b2729a453d03516be79f1':
  Fix mac build for nativebridge tests.