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
am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev

* commit '1361758f90e3c247e2da953913ef424041d1c847':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev

* commit 'cabcc5900790daaa9ca4d080848c9b505c3de126':
  Allowing rotation while adding lockscreen widgets
am 34c4fe52: Fix remaining jank in secure add-widget transition.

* commit '34c4fe523ad96fb59cec28832b38806d04a6bebf':
  Fix remaining jank in secure add-widget transition.
am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev

* commit '6b4ab7f170ea54e5b99cf0635d3803a9407439d7':
  Centering FUL fixes b/7480608
am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev

* commit 'cf9ee4c55db750f86fdcb765c4f21c44bb4bc893':
  Don't pop the IME for passwors at ScreenOn on tablets.
am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '8dbf3b8df0f29d457155e5831dbecf5ba4fff98e':
  Import translations. DO NOT MERGE
am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev

* commit '1b803450255ba1d4e173bd75d5cd9679c5a98915':
  Show the assist ring on center-button longpress on lockscreen.
am a40ec75e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'a40ec75eb3be19b35d10071e93c5b0997eafb0d0':
  Import translations. DO NOT MERGE
am 0fc1b5ec: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev

* commit '0fc1b5ecba383f7d3a5e6154a9569ec7d35d64ce':