OSDN Git Service

am a2ea9ac6: (-s ours) am 5f4696f8: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 25 Mar 2014 19:13:08 +0000 (19:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 19:13:08 +0000 (19:13 +0000)
commitea5d00400b07f918d4d5761dfe4c92fd81cb1992
treef43cb198ce7a685aff686c8f8fdda62b9d11fdca
parent4641bf95bccfb94585ff50f72174fd5160a764dc
parenta2ea9ac68fba4168566a87223f3f557bed33a2ac
am a2ea9ac6: (-s ours) am 5f4696f8: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'a2ea9ac68fba4168566a87223f3f557bed33a2ac':
  Import translations. DO NOT MERGE