| commit | b6dae108b33381f4478781136b0dc395fde38136 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 15:25:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 15:25:20 2015 +0000 |
| tree | 6c609b081811e1254fb40632f46a01b37d5b2917 | |
| parent | 36fc6a88d266ae18151971d390d5e7c9b6d91f55 [diff] | |
| parent | 76625fec224a0fffa0664060f72d6cc1a7e9ba49 [diff] |
am 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '76625fec224a0fffa0664060f72d6cc1a7e9ba49': Import translations. DO NOT MERGE