commit | 1fb480998d96f7dc66f27664f8050d50d9d2ff26 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Dec 10 19:12:31 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Dec 10 19:12:31 2014 +0000 |
tree | 04f41e4be9180272d77168760dabf8dfa36628d3 | |
parent | 0840f961e52d45df25f86b2390eb1afa7f3b4e90 [diff] | |
parent | 83c26e18fc05a07b84698cb02b7a077102f90335 [diff] |
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 83c26e1 -s ours * commit '83c26e18fc05a07b84698cb02b7a077102f90335': Import translations. DO NOT MERGE