tree b3738b766f5576e8e3c68f43aa9830229b4c3f27
parent 4a99019d66879cc7523aa9cbbb355b5bafdc272d
parent 5e3ab35c0aaadcec496d18d1a66e79c35a7f8ffd
author Jim Miller <jaggies@google.com> 1381896033 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381896033 -0700

am 5e3ab35c: am f3cad918: am db148b65: Merge "Fix memory leak and slowness in keyguard" into klp-dev

* commit '5e3ab35c0aaadcec496d18d1a66e79c35a7f8ffd':
  Fix memory leak and slowness in keyguard