| commit | d68f6f49f0b9c8866325a555e8cfbb2c63dbb828 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Oct 22 12:59:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 22 12:59:53 2013 -0700 |
| tree | e25dff5fd21097fa62b1a8a3e2525d349cc08d20 | |
| parent | 42de0037776d933455f27a461abd29ce39a2e77d [diff] | |
| parent | f9f10d03de653910287a3a44cc264889a634c535 [diff] |
am f9f10d03: (-s ours) am 24081d3c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit 'f9f10d03de653910287a3a44cc264889a634c535': Import translations. DO NOT MERGE