commit | 3d58e2292d5133db7efe3367b75e61245460ca06 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu May 15 14:31:13 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 15 14:31:13 2014 +0000 |
tree | 1285ffe30aa976f7bb8abde83214689e2049a4e2 | |
parent | 35b884f88e39c97056e71f329e73812a142103b5 [diff] | |
parent | bd44640c7f532cdfe2b6d8c3e721abd92fbca65e [diff] |
am bd44640c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev * commit 'bd44640c7f532cdfe2b6d8c3e721abd92fbca65e': Import translations. DO NOT MERGE