commit | 3d8f41913c43b3c82b20aef1572fc5a0f7126589 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jan 26 16:50:02 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 26 16:50:02 2015 +0000 |
tree | 34196f8cfb461189a17f2195caeacec7187b41ce | |
parent | a859b50771df9df68872c4e1a1ec721d8210cde3 [diff] | |
parent | 3ec4af9ff66b2a25e08916726486583f0c36b485 [diff] |
am 3ec4af9f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '3ec4af9ff66b2a25e08916726486583f0c36b485': Import translations. DO NOT MERGE