| commit | fdb3d6d7e3e3f310db92f53d5061dcc498a00fc2 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 19:06:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 19:06:30 2014 +0000 |
| tree | f7e4affe4b23e49dba29712777c563a15ca20058 | |
| parent | 3c68bde1ce64e1d6089f9e4fb89cec402f7f57ca [diff] | |
| parent | 06f6b38b76490d574232b526423777d271031730 [diff] |
am 06f6b38b: (-s ours) am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '06f6b38b76490d574232b526423777d271031730': Import translations. DO NOT MERGE