tree ca7e80266ce1800756e45c7a0929c5031af9da3d
parent 31171b6e3155ac075a37aeb28da1a06faeb15276
parent aa1f512b93ada06d76c5b2d2692e1a131b38bfd0
author Andreas Gampe <agampe@google.com> 1411762454 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411762454 +0000

am aa1f512b: am 3496e327: Merge "LibNativeBridge: Add testing"

* commit 'aa1f512b93ada06d76c5b2d2692e1a131b38bfd0':
  LibNativeBridge: Add testing