| commit | f233cce91dd9494df424f8e3caf22e709117b9dc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Oct 14 17:49:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:49:43 2014 +0000 |
| tree | d6c01e271b15fb5fc2e0a3b3a6a2bcaa857401c9 | |
| parent | ce285c8afbc3c26cf15632e442f658a5d2fb76ff [diff] | |
| parent | cd38106a634960f42c282bcc1aab79270cecee78 [diff] |
am cd38106a: (-s ours) am d112c2a3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'cd38106a634960f42c282bcc1aab79270cecee78': Import translations. DO NOT MERGE