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