| commit | d128a280d7a2ee8a9550473a625a14897871375f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Dec 17 15:04:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 17 15:04:20 2014 +0000 |
| tree | 1e2c39a06726edfa0ed207686da686e493297049 | |
| parent | 5846f31a43b424bc8f167ab881c5d6867aa56e16 [diff] | |
| parent | 00e2afb7cf26b231143867e7292a29391c6cfe6e [diff] |
am 00e2afb7: (-s ours) am 6641a0b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '00e2afb7cf26b231143867e7292a29391c6cfe6e': Import translations. DO NOT MERGE