| commit | c37feed0940b0b9b1fdd455c72bc22ae6e579280 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Feb 23 16:47:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 23 16:47:35 2015 +0000 |
| tree | 8c7f309be6c6cb6fed17837c1ee688d643023360 | |
| parent | 9dd645bdd0512456860a0fec66351dfed966b8c0 [diff] | |
| parent | 87809139d223ae1e5629590ba7611b9b1da63cbb [diff] |
am 87809139: (-s ours) am 4c58f127: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev * commit '87809139d223ae1e5629590ba7611b9b1da63cbb': Import translations. DO NOT MERGE