| commit | 2ac19cd33df6446cec494389c7c714dbb951bcf9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 10 18:35:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 10 18:35:39 2015 +0000 |
| tree | a6c857f916e5d40a95cfcd62140d59c79f25d72c | |
| parent | 2b8ca04d2565a4aa3e16944394404ab695e363be [diff] | |
| parent | 2f08aa217e1cef8cd880ba42d1c6970d1adb39c4 [diff] |
am 2f08aa21: (-s ours) am 608f2289: (-s ours) am 31a0f46f: (-s ours) am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '2f08aa217e1cef8cd880ba42d1c6970d1adb39c4': Import translations. DO NOT MERGE