am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes."

* commit '183e5e038bd844ac415b14f22df5c476732066c8':
  AssetManager support for 3 letter lang/country codes.