| commit | 01072c69f184b0a9c513bdddd0e3f2266e0abe8f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:09:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:09:10 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | b3cde203fd67230bbbfa1421d265bb211359905c [diff] | |
| parent | b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e [diff] |
am b2a45cdc: (-s ours) am 6b26d9d4: (-s ours) am 256e2ffd: (-s ours) am cad0777a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'b2a45cdc1f007beb26a38b6c3fe396dfe4cab02e':