| commit | c05bf35e1771191d2f006e32f99a1d11479c2057 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 22:45:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 22:45:41 2015 +0000 |
| tree | a4a82ef6ad1d4f9642c396b346b156449805dfcf | |
| parent | 80e9c04e910f88283f34dddac36f32db291e9c63 [diff] | |
| parent | ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b [diff] |
am ccec9777: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'ccec9777f4ec0ac7d1f50e5b2e0a881d86d12a8b': Import translations. DO NOT MERGE