| commit | bb0bb9aebb76a516bae7b32054852eb828a8ece8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 19 15:11:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 19 15:11:59 2015 +0000 |
| tree | 6693db61f4ef3414209cd09d65f87149a28e26ad | |
| parent | 45ac66f4b9b80b9fae9d925cd98a709b65cd41a7 [diff] | |
| parent | 8a28956d5e55baa47aafb8a10003b995f6bc734d [diff] |
am 8a28956d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '8a28956d5e55baa47aafb8a10003b995f6bc734d': Import translations. DO NOT MERGE