commit | 30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Nov 10 17:16:01 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 17:16:01 2014 +0000 |
tree | 89cf233ca419e15e6f26bc4f8122631d2608a769 | |
parent | c0c9b129440122b05a7245b6b624e83e9be2f93d [diff] | |
parent | 7d447f734d334dfdd953fdcd45b38fabbeec58dc [diff] |
am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '7d447f734d334dfdd953fdcd45b38fabbeec58dc': Import translations. DO NOT MERGE