OSDN Git Service

am 61e3991b: (-s ours) am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Thu, 17 Apr 2014 19:43:31 +0000 (19:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Apr 2014 19:43:31 +0000 (19:43 +0000)
commitdd9e59dc5ce35af35c8f14a320c5d99626e79189
tree6d31720dbc233eed49a084c87acfd11d881759ee
parent5e2841d6e5b878a01ad3f1690303a530a6388f53
parent61e3991bf64b86de32ad24ffcf1753f0f8a80166
am 61e3991b: (-s ours) am 177d9b9a: (-s ours) am b279f527: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '61e3991bf64b86de32ad24ffcf1753f0f8a80166':
  Import translations. DO NOT MERGE