summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2014-03-21 01:25:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-21 01:25:54 +0000
commite920322ff0c67cdd9e9682fd7c7df5221a6fb13e (patch)
tree0fdbd2395f2268ec4c082aefef64f55619b72420 /core/java/android/app
parent3b6689c010edd2deaf112f4d4239deeb2a244ea5 (diff)
parent861196030145ac2a5c9c2abd2c22272cc94fe884 (diff)
downloadframeworks_base-e920322ff0c67cdd9e9682fd7c7df5221a6fb13e.zip
frameworks_base-e920322ff0c67cdd9e9682fd7c7df5221a6fb13e.tar.gz
frameworks_base-e920322ff0c67cdd9e9682fd7c7df5221a6fb13e.tar.bz2
am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '861196030145ac2a5c9c2abd2c22272cc94fe884': Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Diffstat (limited to 'core/java/android/app')
0 files changed, 0 insertions, 0 deletions