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

* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.