summaryrefslogtreecommitdiffstats
path: root/NOTICE
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2013-11-06 15:33:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-06 15:33:39 -0800
commit9cd3b1218e8789aed5e8c746568e43ff4e5481b5 (patch)
tree4ad001cf97d199bbadf64ffc6bc2ca5ded905b68 /NOTICE
parentdf220c5c59f781e7f4dbf507169755163c2b1439 (diff)
parentdf049d6f2270b06679d51021c97eb9559f2657b7 (diff)
downloadframeworks_base-9cd3b1218e8789aed5e8c746568e43ff4e5481b5.zip
frameworks_base-9cd3b1218e8789aed5e8c746568e43ff4e5481b5.tar.gz
frameworks_base-9cd3b1218e8789aed5e8c746568e43ff4e5481b5.tar.bz2
am df049d6f: am 9aed2ae0: am e77d2a9c: Merge "Disable face unlock when returning from camera." into klp-dev
* commit 'df049d6f2270b06679d51021c97eb9559f2657b7': Disable face unlock when returning from camera.
Diffstat (limited to 'NOTICE')
0 files changed, 0 insertions, 0 deletions