Commits
Daichi Hirono authored and gitbuildkicker committed aa3baf8318e
DO NOT MERGE: Fix NullPointerException in MtpManager. BUG=30152892 Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3 (cherry picked from commit 28e6112e2f2cef5852b20e53382ea717a5a6cd41) (cherry picked from commit 9c8e0f1a54d18e92b39814346adf2523fe56d20c)