| commit | 68c112b652194d97dd2b5c488cd2bd118758a0dd | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:17:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:17:31 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | 983dcbd1f858f9bbb5a9781bc9780ece834d70e3 [diff] | |
| parent | 63917040f1143c036ff480cee3e26790eaddb263 [diff] |
am 63917040: (-s ours) am 74d4fdc3: (-s ours) am 29217bcd: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '63917040f1143c036ff480cee3e26790eaddb263': Import translations. DO NOT MERGE