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

* commit '982931c72b6cd00c5eea28efc4b086f47f7aca17':
  AssetManager support for 3 letter lang/country codes.