tree d66996c172307977ba93c5f8649722a306981f4a
parent 2886452b14775f158b1043beacc9a81ce13fb78d
parent ed4994d7f925674732574ff1459917ac2b7f3265
author Yorke Lee <yorkelee@google.com> 1410368496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410368496 +0000

am ed4994d7: Merge "Update keyguard preview per UX feedback" into lmp-dev

* commit 'ed4994d7f925674732574ff1459917ac2b7f3265':
  Update keyguard preview per UX feedback