tree 1bf3e1e50c2221259517f67d376cc6ee3b41d334
parent 44f20f7055cb2d7af7d01a702fe0648e34647aba
parent f502b3842739503e9f09675fc02787b8982dc58f
author Ian Rogers <irogers@google.com> 1411617007 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411617007 +0000

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

* commit 'f502b3842739503e9f09675fc02787b8982dc58f':
  LibNativeBridge: Fix mac build warning