| commit | 1d5ac8dcee3b36a00d44858016f5192115f0b127 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 20 14:17:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 20 14:17:13 2014 +0000 |
| tree | dc2200ae34d1ea4696a6a7b8fdad3713daa550a9 | |
| parent | 95469083da052dbcdb49ed505ff2238c101e2c66 [diff] | |
| parent | 97f548ec76aaf26b92fa553cccfd73f66ddc9b95 [diff] |
am 97f548ec: (-s ours) am bae5d85a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '97f548ec76aaf26b92fa553cccfd73f66ddc9b95': Import translations. DO NOT MERGE