commit | 3488549f75ef5354aa562c03b179b07cbdf3fa6b | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Thu Oct 30 23:42:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 23:42:35 2014 +0000 |
tree | e7c53885859fdeb23aa32cddb0d96a1a343978ea | |
parent | 37e232dc9cf867a81db92988f5f014ef573e3f97 [diff] | |
parent | b2c607dbb876d2d32565e3183f472ea278a609ec [diff] |
am b2c607db: (-s ours) am ba9836d9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b2c607dbb876d2d32565e3183f472ea278a609ec': Import translations. DO NOT MERGE