OSDN Git Service

am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 7 Jan 2014 05:13:55 +0000 (21:13 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jan 2014 05:13:55 +0000 (21:13 -0800)
commit7b6ac45d984eab782d6d635da6e943cae4b76d44
treed8d2a645079e7e380315ac3c207fbaa967c7340b
parentc862dd192ba0225e3ff4908991de6240becb830e
parent7cbf5af891b178523f5091baae4bfa5153cafa3e
am 7cbf5af8: (-s ours) am e1f9ccbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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