| commit | c48e3d03436bd428ef5425114ea138ae097f1f20 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Mar 13 18:02:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 18:02:42 2014 +0000 |
| tree | b4e3afcce6a30e60f20f8ecc325ffcebfad9f3f3 | |
| parent | d7cc4bf482d69d146eb5386b790816c8a46f278a [diff] | |
| parent | 4c9ebc4c149627e4ea0ee82f053628021ef8bfe8 [diff] |
am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev * commit '4c9ebc4c149627e4ea0ee82f053628021ef8bfe8': Import translations. DO NOT MERGE