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