summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSandeep Siddhartha <sansid@google.com>2013-08-27 13:36:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-27 13:36:05 -0700
commitb9265233882d6c026918f985e7448d25d42d5960 (patch)
tree2d0e02bd6d2ae66cb3cf85b0fdcfa140038e29a0 /core
parent628bf2c24039cf03915d581c69c7cf4e90085e45 (diff)
parent572ec4e88c943e0ec717b773406aca43a5eafcb9 (diff)
downloadframeworks_base-b9265233882d6c026918f985e7448d25d42d5960.zip
frameworks_base-b9265233882d6c026918f985e7448d25d42d5960.tar.gz
frameworks_base-b9265233882d6c026918f985e7448d25d42d5960.tar.bz2
am 572ec4e8: Merge "Temporary disable Hotword on lockscreen" into klp-dev
* commit '572ec4e88c943e0ec717b773406aca43a5eafcb9': Temporary disable Hotword on lockscreen
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions