| commit | 19e51a15caf7cbbe45c2e5e4483cda241d10a236 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jun 24 18:11:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 24 18:11:29 2015 +0000 |
| tree | 5de1e86b63ab7f91db18b387f4fbb32f5d03b922 | |
| parent | 311509955aa521c673e09aa9035752eabf17eb4e [diff] | |
| parent | 900c7285f36f8d16e6cb9b7456491af46ba7d94c [diff] |
am 900c7285: (-s ours) am 521db337: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '900c7285f36f8d16e6cb9b7456491af46ba7d94c': Import translations. DO NOT MERGE