commit | 08394af265b02db7a76c4f4f4ae16b9d238e7580 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:03:02 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:03:02 2014 +0000 |
tree | 1c7669753ee3355ffc7a699a225cf5afda97794c | |
parent | 2cb9147fc49e6474eaf30fd833e43df10e42b899 [diff] | |
parent | e69b7b3474c356438fbd65e43438e72ebda0bacb [diff] |
am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'e69b7b3474c356438fbd65e43438e72ebda0bacb': Import translations. DO NOT MERGE