commit | d7211ef8bc5aca625a17e76651b2c99dc8963c03 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jan 21 16:40:45 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 21 16:40:45 2015 +0000 |
tree | 1d2bc3b5a2e995579a6d2ef90de8f477e4e6cda5 | |
parent | ab75f637878ce3237e675cf3e1a5a43c3c009b09 [diff] | |
parent | 893e388fc3406da103733584474e88950ea8ab25 [diff] |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: bae67d3 -s ours automerge: 893e388 -s ours * commit '893e388fc3406da103733584474e88950ea8ab25': Import translations. DO NOT MERGE