| commit | b5cac10334ebe1640ab39039b6fbcbac818cb75a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Mar 26 21:09:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:09:12 2015 +0000 |
| tree | f96c7d6d07aafca9fccc1d8711ab873ec6e475fb | |
| parent | 01072c69f184b0a9c513bdddd0e3f2266e0abe8f [diff] | |
| parent | 22f10ac4016c6879f55d65b16765440ff9453f58 [diff] |
am 22f10ac4: (-s ours) am 7424f8c5: (-s ours) am 585f624b: (-s ours) am 5bc30df7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '22f10ac4016c6879f55d65b16765440ff9453f58':