tree 9628f007b2135efb99532ce8c5f8353d3f678771
parent 8dea789cbef4f6f83aa94a1b8118cdf4f94eb057
parent 5e8bde02d41199676d665ecd8c8c7a03ebaec475
author Elliott Hughes <enh@google.com> 1556137612 -0700
committer android-build-merger <android-build-merger@google.com> 1556137612 -0700

Merge "fix copy large file issue over MTP on 32bit device" am: 37d1715a68 am: 53c0535c11
am: 5e8bde02d4

Change-Id: Ia342fd5bc39b0106338d96215a36b398625279ba