| commit | 8cfd049118df6a023de78b4b909aeb8c5b67ef29 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 18:13:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 18:13:42 2015 +0000 |
| tree | 0853f2740c83af2763e0eceb94e72ae681680d46 | |
| parent | 4ba01226dfd880fa47a0ca6ca39d1c521d38f11f [diff] | |
| parent | 9cbd29113895482a0eaf2920dae91c2c7f9ddd90 [diff] |
am 9cbd2911: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '9cbd29113895482a0eaf2920dae91c2c7f9ddd90': Import translations. DO NOT MERGE