| commit | ba3ab463e0f4b38f7bc8e37dfe0496151ec7b610 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Feb 12 20:25:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 20:25:20 2015 +0000 |
| tree | d006b452d63d7d66868f26e10ce9374af72df64a | |
| parent | efd1d36527702b4b55b786fee18e962b401c5f91 [diff] | |
| parent | 1094b82e1768c215c301ed678e6ff3c81da3ba10 [diff] |
am 1094b82e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit '1094b82e1768c215c301ed678e6ff3c81da3ba10': Import translations. DO NOT MERGE