tree 837d682b8645a8c686458a1ad61ac3015f3399f9
parent 1d4419e3c2067151baa9010f8bda98653c43cfc8
parent b98ea66d353c40810ec10ef48ab638175b0207eb
author Jorim Jaggi <jjaggi@google.com> 1435625677 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435625677 +0000

am b98ea66d: Merge "Disable Keyguard chatyness" into mnc-dev

* commit 'b98ea66d353c40810ec10ef48ab638175b0207eb':
  Disable Keyguard chatyness