tree 3364f08962dd2307749f601698d4ca93e63bae5f
parent 272bd8691dd6cd81d4651a61ee5ea7df8d6e5787
parent 5b566bc005d14fc083751c9079605a99779dcab2
author Jean-Baptiste Queru <jbq@google.com> 1336148366 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336148366 -0700

am 5b566bc0: Merge "provent nativeImOpenDecoder from being removed by proguard"

* commit '5b566bc005d14fc083751c9079605a99779dcab2':
  provent nativeImOpenDecoder from being removed by proguard