tree f3535a88b27ac683926fe037a2624830eb67e6b1
parent 998a5617d5c49c998cf6d102e8d03cbf96f09e51
parent 7fff2d19a24f9f9b669676864dc5652ab179d2fc
author Dianne Hackborn <hackbod@android.com> 1299006794 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299006794 -0800

am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."

* commit '7fff2d19a24f9f9b669676864dc5652ab179d2fc':
  Fix leak when keylock is recreated.