| commit | c9443fc54caa789c4e3c64e7d9feaee8ac00506f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Feb 20 18:36:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 18:36:35 2014 +0000 |
| tree | 1c7669753ee3355ffc7a699a225cf5afda97794c | |
| parent | 2f5347ee46766134848586d67d2dd86bdc9d1952 [diff] | |
| parent | 8ca432c7828d5d3d00c721b195a4ecb59564bbb7 [diff] |
am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '8ca432c7828d5d3d00c721b195a4ecb59564bbb7': Import translations. DO NOT MERGE