| commit | 2c636248dd7e62c4f17c304df08eb73652d788fa | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 08 19:08:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 19:08:07 2015 +0000 |
| tree | 1bb2deb78d04073639407a0793b12e1ada57f25b | |
| parent | 8eafcc164756869f6a8529cb6b5683483eb6639b [diff] | |
| parent | e618963b93c81694124d61eab6528cabf5edfdc8 [diff] |
am e618963b: (-s ours) am 035e10f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'e618963b93c81694124d61eab6528cabf5edfdc8': Import translations. DO NOT MERGE