summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Mike Lockwood <lockwood@google.com> 2014-03-14 21:47:37 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-14 21:47:37 +0000
commit685831bf8da4f89366ce16c1852f25efad046261 (patch)
tree4429acd33e0be2cc4ce491d4dee140bd9e27962e /libs/androidfw/AssetManager.cpp
parent4a02e0716d43bd2bf9b96a8b1dae181f9c35dcbf (diff)
parentf9b90434ef04b509c7dcb868d50aa53a66b97809 (diff)
am f9b90434: am ff64f5ed: am 381374b3: Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev
* commit 'f9b90434ef04b509c7dcb868d50aa53a66b97809': UsbDeviceManager: Fix race condition between accessory start and USB configured uevents
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions