| commit | cdd07216563faccad1c439eee23ca9d4b64c0ac7 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 17:19:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 17:19:47 2014 +0000 |
| tree | 247c2e2bc1c19590612b497b38df8303b950480e | |
| parent | 163b865564fdb4d491c54ee04efb17af80a18689 [diff] | |
| parent | 27f67d25c8c77e609eb523b98fd7276e0ae8e3e0 [diff] |
am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '27f67d25c8c77e609eb523b98fd7276e0ae8e3e0': Import translations. DO NOT MERGE