diff options
| author | James Dong <jdong@google.com> | 2012-08-22 14:50:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-22 14:50:27 -0700 |
| commit | d78fc5b94d1bb3dab509ca55d09052821c51412b (patch) | |
| tree | 8899b553fbd42c74fef5a0f51a08b70ec1017294 /services/java/com/android/server/usb/UsbDebuggingManager.java | |
| parent | b9b56954ec5a242f7c4945942539106539f98ffb (diff) | |
| parent | 0889fdae87abd9ec78a6c1d00c2771acfa4e4d34 (diff) | |
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/usb/UsbDebuggingManager.java')
0 files changed, 0 insertions, 0 deletions