OSDN Git Service

am 333cd7e2: (-s ours) am 341df06f: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Mon, 19 Aug 2013 20:10:55 +0000 (13:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 19 Aug 2013 20:10:55 +0000 (13:10 -0700)
commit099d5b865fd1839430292116cd3d98ac3fd7703a
tree6fa02285803f527c046b3653d9072021c37646f2
parentc617df3202211c19bc42ca064637c59d40939c96
parent333cd7e23ebbfc168be22e129fe57370cbb94826
am 333cd7e2: (-s ours) am 341df06f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '333cd7e23ebbfc168be22e129fe57370cbb94826':
  Import translations. DO NOT MERGE