OSDN Git Service

am 94723401: (-s ours) am 04acf38c: (-s ours) Merge "Import translations. DO NOT...
authorBaligh Uddin <baligh@google.com>
Tue, 22 Apr 2014 14:52:43 +0000 (14:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Apr 2014 14:52:43 +0000 (14:52 +0000)
commit49c4aeef081d7c9f075027cd9112858cdcab8166
treed5f81e75c6fb735cd035abac6323223e801abc67
parentaf57bb911ae57b21569dc1bf19048eaa05fbefb8
parent94723401bdfaf2d1a5c792654fe18d7f6d21607e
am 94723401: (-s ours) am 04acf38c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit '94723401bdfaf2d1a5c792654fe18d7f6d21607e':
  Import translations. DO NOT MERGE