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