OSDN Git Service

am 19107fdb: (-s ours) am 29b0a905: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 5 Nov 2013 23:49:47 +0000 (15:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 Nov 2013 23:49:47 +0000 (15:49 -0800)
commit42b4a018584f9f75ad6cd87f242e1417950cd5a0
treeb458a15a54a5e2d5ec385af03ee343731f32450a
parentd7c174fbef4048e70766fc671867d674baf101e5
parent19107fdb1f1c831b6fba7bae08c69c30231db033
am 19107fdb: (-s ours) am 29b0a905: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '19107fdb1f1c831b6fba7bae08c69c30231db033':
  Import translations. DO NOT MERGE