am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev

* commit '0324bb1a9972ec766b65d4b47b9688588633967b':
  Restore jankless transition keyguard-to-wallpaper
tree: 02cbf8421d6b998bf76e2b5b75cde48fc7904f41
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml