am 5da893c9: Merge "Add one more check for detecting crashes while inflating multiuser widget" into jb-mr1-lockscreen-dev

* commit '5da893c93b55c83b07558a1648f53dfec89b1f32':
  Add one more check for detecting crashes while inflating multiuser widget
am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev

* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
  Fixing up overscroll asset / sizing
am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev

* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
am 5c533884: Merge "Make dismissKeyguardLw use KeyguardViewMediator.dismiss()." into jb-mr1-lockscreen-dev

* commit '5c533884ead3bb8a8e2e4e8d79587a81dbe31700':
  Make dismissKeyguardLw use KeyguardViewMediator.dismiss().
am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev

* commit '3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
  Attempt to fix NegativeArraySizeException crash in keyguard
am d8e2fdf7: Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev

* commit 'd8e2fdf7345f448f332ea8a551172f48563f77aa':
  Use stable layouts for keyguard/SlidingChallengeLayout
am 71b7d891: Merge "New asset for assist affordance on lockscreen." into jb-mr1-lockscreen-dev

* commit '71b7d891fc95d360df7a52c7008c92859b9dfdb8':
  New asset for assist affordance on lockscreen.
am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev

* commit 'ae0161e7af280a35e975dc26457ab4f704d37d0a':
  Don't handle click events on the emergency button in bouncer mode
am 2635750f: Adding workaround to fix issue where the bouncer animation had the wrong pivot.

* commit '2635750fa7f835d102c3fd52b18e00d364d9ae42':
  Adding workaround to fix issue where the bouncer animation had the wrong pivot.
am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev

* commit 'e7e210cb4373877785130ff06ad4e6635592eaa8':
  Fiddle with keyguard glowpad layouts
am 9eacab8a: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev

* commit '9eacab8abee6b8d154f5de2513fcbaed313c4b24':
am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev

* commit '838195db8f69968690971977e4b615df39504465':
  Compress lockscreen's account login fallback to fit.
am 70c2f873: Synchronizing bouncer duration with page scaling duration.

* commit '70c2f8736437ebb6073c3b6dab2e08e6dd9f39a6':
  Synchronizing bouncer duration with page scaling duration.
am 1e0f6faf: Merge "Clean up some flashy jank (issue 7454766)" into jb-mr1-lockscreen-dev

* commit '1e0f6faf5abea0aae49bdae973bd15b675817224':
  Clean up some flashy jank (issue 7454766)
am 2cacda5f: Disable interactive mode for full-screen security views in keyguard.

* commit '2cacda5fc92a28a44a37e25b96093a9cc1346080':
  Disable interactive mode for full-screen security views in keyguard.
am a9fa92e8: Keyguard - force showing the status bar

* commit 'a9fa92e889a9dbc94c25e4ba1d67ce24929b834f':
  Keyguard - force showing the status bar
am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev

* commit '5dd8b00891faff39ecadb1a0322e14528883bfe3':
  add bouncer frame to glowpad.
am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev

* commit '6be441c532688762b735ae2a1276195b40bf33b4':
  Add mechanism to kick keyguard to show the assistant
am e1a473b0: Merge "Don\'t show ECA in landscape mode on phones." into jb-mr1-lockscreen-dev

* commit 'e1a473b0d4d56f4258fc4c6ab4c9d4d0fe3fd3cc':
  Don't show ECA in landscape mode on phones.
am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev

* commit 'c8ed8d32603d21e1af9a682cc5f1655d2388cfba':
  Adding user activity when the challenge is slid down