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