OSDN Git Service

am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 7 Jan 2014 00:30:30 +0000 (16:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jan 2014 00:30:30 +0000 (16:30 -0800)
commitbe24e41b41e9ccec3bb685baf9dc951b386116ee
tree0ddc2923cb69abb53f1137fd0d2156a76616aafb
parentf256f49f9fddbd035375ea8c6444cf7fa36418ca
parent2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2
am 2c4d6d91: (-s ours) am fd8be467: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2c4d6d91e21ae678cff7b9ee2c78ffd0681d5da2':
  Import translations. DO NOT MERGE