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