| commit | ed133f9c4a907f111ef639fcd56ddad865c0fcd4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:54:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:54:19 2015 +0000 |
| tree | 98e7456eec6fc6df6b7478bde91a23599e013a37 | |
| parent | 8455d01832f6d89b7ec296bdd8aada2672ecf608 [diff] | |
| parent | b23235829c7e8a6531ba98defce6349094dff238 [diff] |
am b2323582: (-s ours) am 335ffd32: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'b23235829c7e8a6531ba98defce6349094dff238': Import translations. DO NOT MERGE