OSDN Git Service

am 7b6ac45d: (-s ours) am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Tue, 7 Jan 2014 05:46:15 +0000 (05:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jan 2014 05:46:15 +0000 (05:46 +0000)
commit40719a337093cca58885e16d6e0ae7f7da5fc7ad
treed8d2a645079e7e380315ac3c207fbaa967c7340b
parentb54384cb1dea088b1a6a1e71113a09995ea11b1e
parent7b6ac45d984eab782d6d635da6e943cae4b76d44
am 7b6ac45d: (-s ours) am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '7b6ac45d984eab782d6d635da6e943cae4b76d44':
  Import translations. DO NOT MERGE