am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev

* commit '9f79d0db09818e94b6c2089f952d1ef42e1e1fae':
  make challengeShowing sticky across bounce.
am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev

* commit '5eac4d852bdc62964acd1c8805b6e9cd8301f262':
am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev

* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
  Attempted fix for issue 7469415
am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev

* commit '7741e6209ab4c6425ee4156631f54fe9bfce5fc3':
  Making sure the sticky widget logic works with music
am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev

* commit '2d9fae2bcfbc8021873a39b3935644e9b9fb5af2':
  Removing callbacks in onDetachedFromWindow, fixes b/7465673
am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev

* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
  Add isSafeModeEnabled() API to WindowManagerService
am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions.

* commit '6cf53bb3a94ec5a6eebc96a315dac32d042f1945':
  Using screen dimensions to calculate the expanded PagedView dimensions.
am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev

* commit '5fcca70d280a789002f540ea04b9d7ae5d7fe324':
  animating challenge closed should close the challenge.
am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev

* commit '8d803258ca1550583d03c1a24c5c6d4b38535ba8':
am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev

* commit '7136544c06c2d10c7a1c6aa8715d2b717221aee8':
  Keyguard - MultiPaneChallengeLayout measurement/layout changes
am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev

* commit '688d98fe2185774322aa87dffd656fad471823ef':
am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev

* commit '475255bffc792b48e18213a6bfde0fc9ebeb4a34':
am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets

* commit '51117262c8fadb6d227d137e83ad66996b013141':
  Handle DevicePolicyManagement and safe mode when inflating widgets
am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev

* commit 'bc69698c8f1fdf7abc9ffb0225e47633617f5628':
am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev

* commit 'ad9f594e1ca36d4b847ec14e9ccf6e2d40bbc388':
am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev

* commit '835579e8173700be78368827d5c042ac4f698e29':
  Removing sticky widgets in lockscreen
am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev

* commit '42164efac3f4422e66d176de24e1a0857cacabab':
  Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev

* commit '9d0d796f47524da7abe018ca6ad892b819a0e66f':
  Fix emergency call area updates.
am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev

* commit '9edc48e26354f6a7282e68851a6d9ba734c7ceb1':
  Updated assets.
am 9799714f: Keyguard layout tweaking/reworking

* commit '9799714f6c69efe50e21a6073b879140e5e792b7':
  Keyguard layout tweaking/reworking