| commit | fb52c953ac98cd7751a6d49cedf99eefcf86e70f | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Fri Feb 21 16:52:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 21 16:52:50 2014 +0000 |
| tree | 77ae6dc696eb7f2942e6d5bfebdccb95eebf8a6e | |
| parent | 786190c2237a38ca997ef0966cabeb8c271455d2 [diff] | |
| parent | 4b9936d302679369d6ec912bfd248366afafbe85 [diff] |
am 4b9936d3: (-s ours) am 801517fe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4b9936d302679369d6ec912bfd248366afafbe85': Import translations. DO NOT MERGE