| commit | 9bfa64945fba5aa038e0b9290607c73eba39e9fc | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 17:17:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 17:17:59 2014 +0000 |
| tree | e6d65d08a9053d93f1888503f53e2817accaf172 | |
| parent | 269ab5e557c516fca8e1d3e1cc481e7fdb1d21ed [diff] | |
| parent | a9ab2a62dfad586b4ea307321b6330bdc468497b [diff] |
am a9ab2a62: (-s ours) am b4b0e65e: (-s ours) am b76ca05f: (-s ours) am fb52c953: (-s ours) am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'a9ab2a62dfad586b4ea307321b6330bdc468497b': Import translations. DO NOT MERGE