| commit | 88c2400a67e542bd1e70957e06c4a08abc7e59da | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Aug 22 10:45:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 22 10:45:20 2013 -0700 |
| tree | 3732a172a024b594bf7b683e258aff2166d4fe4f | |
| parent | 93f7e77173d22a9bb9d8f60a1a7396e33707f8e4 [diff] | |
| parent | 4954e29fbce2582f23df8c0aad4bb5463ee7e602 [diff] |
am 4954e29f: (-s ours) am 570e7bd9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4954e29fbce2582f23df8c0aad4bb5463ee7e602': Import translations. DO NOT MERGE