| commit | c9664084c71c97d9ace82ff5184f02e743273a41 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:08:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:08:40 2015 +0000 |
| tree | 156318d1e7602a679e0bb7d9834512a17995ea14 | |
| parent | e45179a2afad7c9b679e5242a0606ec342538c82 [diff] | |
| parent | f72e120216d591f6ed1a9aa69d34009d69848108 [diff] |
am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'f72e120216d591f6ed1a9aa69d34009d69848108': Import translations. DO NOT MERGE