| commit | 07f0a2f9c1e725c20e8922f70f3dbf934687a4a0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Nov 21 14:28:16 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 14:28:16 2013 -0800 |
| tree | 8561a54a2238de5a4eb7663d960ec5623fd4e7a0 | |
| parent | 76ea05e3f24c7c8193efbc615422e6f5c6af9fe6 [diff] | |
| parent | d69acbda4f19c86e8e6171cc2981f3478b896d71 [diff] |
am d69acbda: (-s ours) am 78c87758: (-s ours) am 971ca440: (-s ours) am d2eab38a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'd69acbda4f19c86e8e6171cc2981f3478b896d71': Import translations. DO NOT MERGE