| commit | 26313e3a818704e08a7d3f88fb4ae19b14d96e18 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 21:21:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 21:21:08 2014 +0000 |
| tree | 418b2188c38647a542d3ae0ba6ae1a904e8b38eb | |
| parent | 85beee2810b75fca3c5fd804dafecfa2669b9e2d [diff] | |
| parent | 074de5677db77a19c424743aa7abb44f0faca83a [diff] |
am 074de567: (-s ours) am 1571297d: (-s ours) am 64667070: (-s ours) am 46f2a32e: (-s ours) am 8c30c2ce: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '074de5677db77a19c424743aa7abb44f0faca83a': Import translations. DO NOT MERGE