summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@google.com> 2014-03-14 21:54:13 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-14 21:54:13 +0000
commit9428eb82c0cadf897e47475e616d3927cb2524e7 (patch)
tree697d1659b850b8463b72a38c63559274be8991d7 /libs/androidfw/BackupData.cpp
parent421a1dd197a78b014cb9a899a75c0fa43510a59a (diff)
parentc5353ce373f02b549ed9e63aa23f94ca1a726f7e (diff)
am c5353ce3: am 685831bf: am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit 'c5353ce373f02b549ed9e63aa23f94ca1a726f7e': UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions