commit | 649fee03263decf9df12db01f02cf77779a388ce | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 27 16:42:51 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Oct 27 16:42:51 2014 +0000 |
tree | 047f9bdedc51fed58f3c76562d93052a361a8a14 | |
parent | 496f0ea68ae043dd8fd26b8a9577c496e25083c0 [diff] | |
parent | 5a1a14a8174213edcd5f1d7f8fbc427122b25f99 [diff] |
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev automerge: 5a1a14a -s ours * commit '5a1a14a8174213edcd5f1d7f8fbc427122b25f99': Import translations. DO NOT MERGE