tree 1f0aacf2e080375f3ff39ed8f6e8d662905c9a3a
parent c81e1f15d28711d69f576d34741ec06faea0c4de
author Daichi Hirono <hirono@google.com> 1468910884 +0900
committer Daichi Hirono <hirono@google.com> 1476769348 +0900

DO NOT MERGE: Fix NullPointerException in MtpManager.

BUG=30152892

Change-Id: I1f4ec361f499510e3ac1635ca5d134b47b6059c3
(cherry picked from commit 28e6112e2f2cef5852b20e53382ea717a5a6cd41)