| commit | 46e5985c668eee24d64467099e1b94a33c0b8250 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 29 17:26:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 29 17:26:08 2015 +0000 |
| tree | 6b3ba82eefad2ab53441fec1f564774dca28f234 | |
| parent | 8d5c941d06c487559377596d3f2f0204f0208257 [diff] | |
| parent | a7aebe0b8220ea072845376bb84179967d28bde9 [diff] |
am da616ea6: (-s ours) am 62efaf15: (-s ours) am 208daa1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'da616ea6644c5b363d770badf22db44ed25cc267': Import translations. DO NOT MERGE