commit | ea7411bde612a87a5fddf5084110c84211dee34d | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Jan 21 15:03:37 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jan 21 15:03:37 2015 +0000 |
tree | b14270d85fe4b15d06c6a1537dcf4ae2d2ff5060 | |
parent | e272db9505dbfc02dd1d4af208dc18536961443b [diff] | |
parent | 2898f37b65b956fb92a0dc67ea5c8afb2c959c6b [diff] |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 2898f37 -s ours * commit '2898f37b65b956fb92a0dc67ea5c8afb2c959c6b': Import translations. DO NOT MERGE