tree 63fd2024d01063dd43526f1ba0409c9ea8c669cc
parent b79956b2a0cbaba8ecc420053b2e36fb981a2f4f
parent 8a65899e8a58047c1a29e243719ec25bf59a3448
author Ian Rogers <irogers@google.com> 1411617342 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411617342 +0000

am 8a65899e: am f502b384: Merge "LibNativeBridge: Fix mac build warning"

* commit '8a65899e8a58047c1a29e243719ec25bf59a3448':
  LibNativeBridge: Fix mac build warning