| commit | f8d3c35469618b6feda5f7f04405f62da3c6cd34 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 17:02:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 17:02:22 2014 +0000 |
| tree | f6eccb9ae376d630dd503a2a542a780ded72f14d | |
| parent | 67509927593b3654e5bf92a6db1abd91b73f2dff [diff] | |
| parent | 00831836cdeeb4a61ba10c724c3ca33280937b62 [diff] |
am 00831836: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '00831836cdeeb4a61ba10c724c3ca33280937b62': Import translations. DO NOT MERGE