| commit | 3a289a2f973ce1767fa552e3fbb70acd952a82d5 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Aug 12 18:27:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 18:27:40 2015 +0000 |
| tree | a31079e4c515959bec209480ff5cda333856d0c9 | |
| parent | 2b71aa764bb5d181198c8e6a9aaeefe7c5d2f175 [diff] | |
| parent | 29e963afbcca60cb3364d1350d7667e6c2a61789 [diff] |
am 29e963af: (-s ours) am b689d776: (-s ours) am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '29e963afbcca60cb3364d1350d7667e6c2a61789': Import translations. DO NOT MERGE