| commit | b73ca6ed35f054e7129b2ca9b96218fd9c65a8ca | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sat Sep 20 04:59:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 20 04:59:35 2014 +0000 |
| tree | 00ceb9008c92fd94b736c7d9c8055811343f30db | |
| parent | cd19c2dc7dff77e6704427ab8c189fbf366f9f0f [diff] | |
| parent | 143401018a4cf6d7ad8a0baf96d74c8e9b3e40f5 [diff] |
am 14340101: (-s ours) am 7da76789: (-s ours) am be132cca: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '143401018a4cf6d7ad8a0baf96d74c8e9b3e40f5': Import translations. DO NOT MERGE