OSDN Git Service

am e6b93f95: (-s ours) am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 14 Feb 2014 20:53:03 +0000 (20:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:53:03 +0000 (20:53 +0000)
commit7c3fe3947d3c52a06d34f7b9e23cbc9c14fb8b32
tree4f17d9329b6dccf2976cd81880c5fed07819af43
parent88485bb5d086e66248fed3246681703860c16a8f
parente6b93f95f792726d52518eb5f0da5ecd1c902862
am e6b93f95: (-s ours) am 0dc42a5d: (-s ours) am 349763d0: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jolly-elf

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