am 9fc8e6fe: am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."

* commit '9fc8e6fe8f6c89f5ebcda4b569cab10988e1fa3f':
  Make getAssetInt throw unconditionally.