| commit | 1ac9628c97a04dacfaaf4ebe5dbcfd6599b0405f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 14:19:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 14:19:11 2015 +0000 |
| tree | 8a9b9526a498f0170bfe70986bf3e4e524ba46df | |
| parent | 5cae0cded77f412d738bfdc2e58036c8e9422135 [diff] | |
| parent | 8d5ed661f060e3d915f3f1f593f2f87ebd1285cc [diff] |
am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '8d5ed661f060e3d915f3f1f593f2f87ebd1285cc': Import translations. DO NOT MERGE