| commit | bfa09525ab4b307ebe8f4e38f8b3ac6aee19e466 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 23:55:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 23:55:05 2014 +0000 |
| tree | 361e30d4af84b68fdbf7dfe32175b2d4dfd17a20 | |
| parent | a3ad702f38b17fe27d5f73bb98a123959ada59ac [diff] | |
| parent | a6b027084cdeefcd431a4e6b46c1718ed3dfb874 [diff] |
am a6b02708: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'a6b027084cdeefcd431a4e6b46c1718ed3dfb874': Import translations. DO NOT MERGE