| commit | bd16cb67a4058d6faa8123f30fe657c0607dd05d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 00:38:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 00:38:13 2015 +0000 |
| tree | dca6238534b29f53d7fc3960c91779583a574fba | |
| parent | afe3c2b3e51b254826b44559d6f4aebe40855168 [diff] | |
| parent | b48de758b28cdc34ce1fb307d096d3f6f9cddb57 [diff] |
am b48de758: (-s ours) am d64aa493: (-s ours) am c021aaaf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'b48de758b28cdc34ce1fb307d096d3f6f9cddb57': Import translations. DO NOT MERGE