OSDN Git Service

am 8f54f8d6: (-s ours) am 982931c7: am 183e5e03: am 49024bac: Merge "AssetManager...
authorNarayan Kamath <narayan@google.com>
Mon, 17 Feb 2014 11:15:41 +0000 (11:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Feb 2014 11:15:41 +0000 (11:15 +0000)
commit96cbd05a245d55a8221336249d836217a5369a04
tree88955d664ccfa8bcc8e2ba3c29256d152d43b6b5
parentfde7865c16599f617de08001dbc0ce7d8be6da30
parent8f54f8d6dcdb6249ccc76e14d61dc4d4e4af029e
am 8f54f8d6: (-s ours) am 982931c7: am 183e5e03: am 49024bac: Merge "AssetManager support for 3 letter lang/country codes."

* commit '8f54f8d6dcdb6249ccc76e14d61dc4d4e4af029e':
  AssetManager support for 3 letter lang/country codes.