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