tree 0b0806dada2e2a15e269ecc20fb91fbe4c03922d
parent 59ff85af314e2984068943f5572ac40ef381edea
parent 2000fe58332dffaad34c618fe35840992cb0f571
author Narayan Kamath <narayan@google.com> 1393506956 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393506956 -0800

am 2000fe58: Merge "Make getAssetInt throw unconditionally."

* commit '2000fe58332dffaad34c618fe35840992cb0f571':
  Make getAssetInt throw unconditionally.