summaryrefslogtreecommitdiffstats
path: root/keystore
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-07-26 02:34:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-26 01:02:19 +0000
commitf0f0f7ca66e15c5cebfbcf38a8d1e576b3e6e335 (patch)
tree74b04c1887ef5ed4bac742ed3cd738f6c664775e /keystore
parent9bd8b1fc28d722da43a29619dd596c3fd9201f2f (diff)
parent4b4971b8a31f29e9dd3d27d54a49914a7c3ec1fb (diff)
downloadframeworks_base-f0f0f7ca66e15c5cebfbcf38a8d1e576b3e6e335.zip
frameworks_base-f0f0f7ca66e15c5cebfbcf38a8d1e576b3e6e335.tar.gz
frameworks_base-f0f0f7ca66e15c5cebfbcf38a8d1e576b3e6e335.tar.bz2
Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
Diffstat (limited to 'keystore')
0 files changed, 0 insertions, 0 deletions