| commit | cb1fa92afb8a9565477bdbedf7b4804472fad4c5 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Oct 05 21:24:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Oct 05 21:24:32 2013 -0700 |
| tree | 98b64f6e3cce955e08b489e6ac2439a9ba293075 | |
| parent | b9de7a5f1a39d5ba2da83c434c432122db1e5bb6 [diff] | |
| parent | f634f4b7cbada0cb722016a5f8c8ce5bae517dae [diff] |
am f634f4b7: (-s ours) am 142eb1c4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'f634f4b7cbada0cb722016a5f8c8ce5bae517dae': Import translations. DO NOT MERGE