| commit | 6e9b4af336ad2869139a51ea4ac1d90747530f00 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Jan 29 17:30:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 17:30:45 2015 +0000 |
| tree | 0d0ac357dc64996219523b21d0a74e7e860100b1 | |
| parent | eae882b0a115b6c18975d667e8f5cdebeb19d8df [diff] | |
| parent | 2f19b0b5c8137609c64733bc6d94662143664512 [diff] |
am 2f19b0b5: (-s ours) am 7fbb4a91: (-s ours) am c84e354c: (-s ours) am ca58fb9c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '2f19b0b5c8137609c64733bc6d94662143664512': Import translations. DO NOT MERGE