summaryrefslogtreecommitdiffstats
path: root/obex
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-05-06 20:01:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-06 20:01:43 +0000
commitef3b18b10111834e9d9b4887984a4e9b5de8fed9 (patch)
tree5e027d205a9cb553910b36fdfaf228877825a7a8 /obex
parenta2d106d4703c1473772756a2201d2b11492489c5 (diff)
parentc1cf1aec53ec4bf201dbcd46b8950a16e9daf038 (diff)
downloadframeworks_base-ef3b18b10111834e9d9b4887984a4e9b5de8fed9.zip
frameworks_base-ef3b18b10111834e9d9b4887984a4e9b5de8fed9.tar.gz
frameworks_base-ef3b18b10111834e9d9b4887984a4e9b5de8fed9.tar.bz2
Merge "Never close Keyguard automatically."
Diffstat (limited to 'obex')
0 files changed, 0 insertions, 0 deletions