| commit | cbd667314d301b5613a7e0a8ecb148da52ca00f3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Mar 21 05:43:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 21 05:43:54 2015 +0000 |
| tree | b3838b136bb1a48d6762882d85ffd2a532075741 | |
| parent | fbda111f2d53a57322172b0e30b491afb3d32193 [diff] | |
| parent | ba3ab463e0f4b38f7bc8e37dfe0496151ec7b610 [diff] |
am ba3ab463: (-s ours) am 1094b82e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev * commit 'ba3ab463e0f4b38f7bc8e37dfe0496151ec7b610': Import translations. DO NOT MERGE