diff options
author | Mike Lockwood <lockwood@google.com> | 2014-03-21 01:20:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 01:20:43 +0000 |
commit | a5853b177c80052246c361e0bc2b0e5809cfeef2 (patch) | |
tree | 04e98a56ae74c15782f459455067742efd0d730c /core/res/AndroidManifest.xml | |
parent | 861196030145ac2a5c9c2abd2c22272cc94fe884 (diff) | |
parent | 1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b (diff) | |
download | frameworks_base-a5853b177c80052246c361e0bc2b0e5809cfeef2.zip frameworks_base-a5853b177c80052246c361e0bc2b0e5809cfeef2.tar.gz frameworks_base-a5853b177c80052246c361e0bc2b0e5809cfeef2.tar.bz2 |
am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Diffstat (limited to 'core/res/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions