| commit | 2deb919f938017bce885dcab163e169d81b5ec55 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Mar 25 14:36:53 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 14:36:53 2014 -0700 |
| tree | d005f7092bdea7c123c548628286905850157b84 | |
| parent | 7337e5683be2231ba34f9832ea91243183c5ef58 [diff] | |
| parent | 26313e3a818704e08a7d3f88fb4ae19b14d96e18 [diff] |
am 26313e3a: (-s ours) 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 '26313e3a818704e08a7d3f88fb4ae19b14d96e18': Import translations. DO NOT MERGE