OSDN Git Service

Merge "Add error message for locked device." into nyc-dev
authorDaichi Hirono <hirono@google.com>
Fri, 12 Feb 2016 02:51:16 +0000 (02:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 12 Feb 2016 02:51:17 +0000 (02:51 +0000)
commit0abde68519f62d001aa075235c6da2e594ffc186
treebe9aaa0fff328be2dd05e2488c76bb57d39c3b21
parent46d537716e00878073a740101f1e1e088f728817
parent2965776ba403ef1f6d9a0e870ebf3c44ee5d8373
Merge "Add error message for locked device." into nyc-dev
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java
packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java