| commit | f8952681a54c399c1b784c23d550192d240e6220 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Feb 25 17:27:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 17:27:07 2015 +0000 |
| tree | dfa7bb9f144869f7fe6266887195fec9ddc1f040 | |
| parent | c3470ec215b0de42173eb9ee06cecc2d5f65e8e3 [diff] | |
| parent | d170ff32c03cd6c8cf85e9f820342a26d3dbba78 [diff] |
am d170ff32: (-s ours) am 28e4a357: (-s ours) am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit 'd170ff32c03cd6c8cf85e9f820342a26d3dbba78': Import translations. DO NOT MERGE