| commit | 3891ce73206d4cf74c6aec1d5bf1b2b89fb90cb2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jan 16 20:46:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 16 20:46:48 2015 +0000 |
| tree | 841bcd6a1ebcf8d5e937915f3483fa498f4c7353 | |
| parent | 898290afd55733b09a98eb15f6c71d6aaad75072 [diff] | |
| parent | 2c8e6daab7158ee2a5fd3eff0cd5f5d61961fa27 [diff] |
am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '2c8e6daab7158ee2a5fd3eff0cd5f5d61961fa27': Import translations. DO NOT MERGE