commit | 9c02cc81ef5c870f53bf663e0a695255d12c0de0 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:47:21 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:47:21 2014 +0000 |
tree | 1896fb35993cc028e811e754083a033726fab1c3 | |
parent | 21d4b327496e6d74dcf214ee20be2c864aa90348 [diff] | |
parent | eb379bc63a0be440c733b4b3f0997123d3a6ac48 [diff] |
am eb379bc6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'eb379bc63a0be440c733b4b3f0997123d3a6ac48': Import translations. DO NOT MERGE