| commit | 2dd6248662f94d0f82a457a078e917e063ecd37a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:43:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:43:07 2014 +0000 |
| tree | aa28c3d5fe0b52253edff4b1fbe1e175b39b56f7 | |
| parent | 7aa93c2da61e40cf69278477ecc042a2b37d6e41 [diff] | |
| parent | 9f2ea5adc40aa57c6bb4345e9facb200e6acfad1 [diff] |
am 9f2ea5ad: (-s ours) am 3412bb1e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '9f2ea5adc40aa57c6bb4345e9facb200e6acfad1': Import translations. DO NOT MERGE