OSDN Git Service

am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
authorBaligh Uddin <baligh@google.com>
Tue, 25 Mar 2014 19:02:05 +0000 (19:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 19:02:05 +0000 (19:02 +0000)
commit0a4bd7c90c836a8d3d857753c72d83b35cefa5f3
tree9fd824aa97918e7c30f4ac4c6e0b4a852456ed02
parentd7bf82d6a422a8b10e2a9bea7f4e3fcdc804d19b
parentf318306232c2cb3095eecd72d1fa06059bf35f8e
am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev

* commit 'f318306232c2cb3095eecd72d1fa06059bf35f8e':
  Import translations. DO NOT MERGE