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

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base