tree 649964d8248bd5aa535a404b3a360d9f4f6541dc
parent 8e1e54154bc7a5e9dee206735474186c2276b111
parent 9f93e297ee7df04bf605b9dc1251f7c772c48189
author Andreas Gampe <agampe@google.com> 1411707557 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411707557 +0000

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

* commit '9f93e297ee7df04bf605b9dc1251f7c772c48189':
  LibNativeBridge: Fix two bugs