commit | c8e35f487e173f280a3f3bd96f5b42b7e778d403 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Aug 05 13:06:37 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 05 13:06:37 2014 +0000 |
tree | d8e1551af7f525c772cdde483f521a399a8dc17a | |
parent | 76a07888794370042ea63c0a8000cbb63fe27e73 [diff] | |
parent | 7c366c7dbf2dd0d21730445c8e7d9e382c8bbaca [diff] |
am 7c366c7d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '7c366c7dbf2dd0d21730445c8e7d9e382c8bbaca': Import translations. DO NOT MERGE