tree d367ad722947e39fd30a8bad985d43370742cc3f
parent 547a21acd39529bdd1c7c03ce993bb23ec679f10
parent f0699c11debade875e87efad27d37ddf6fa83ed6
author Andreas Gampe <agampe@google.com> 1412029028 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412029028 +0000

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

* commit 'f0699c11debade875e87efad27d37ddf6fa83ed6':
  Fix mac build for nativebridge tests.