tree 0d9cc3e14c68a0650b3dcb1e3ef612cd2c3f3f71
parent 7aede64a0a5963611a888820b273dd6c60c305cd
parent 2d687fe3d8af29e79ee13e5d6c3d71113d6f575a
author Andreas Gampe <agampe@google.com> 1411708453 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411708453 +0000

am 2d687fe3: am 9f93e297: Merge "LibNativeBridge: Fix two bugs"

* commit '2d687fe3d8af29e79ee13e5d6c3d71113d6f575a':
  LibNativeBridge: Fix two bugs