am 66769767: Merge "Treat the default sound Uri the same as DEFAULT_SOUND." into jb-mr2-dev

* commit '66769767b68f3fbe586c153d9d483916e4d9006b':
  Treat the default sound Uri the same as DEFAULT_SOUND.
am 25df1a82: Merge "use appropriate fallback chain for style" into jb-mr2-dev

* commit '25df1a82a846cbdbdd2de0ce3d6741dfcfdf31fd':
  use appropriate fallback chain for style
am effb153a: Merge "Lengthen the AM timeout reading crash reports slightly" into jb-mr2-dev

* commit 'effb153abaf57023382a7cb0cd64215f1db2992c':
  Lengthen the AM timeout reading crash reports slightly
am e8d12dd6: Merge "Fix issue #8032572: Android app permission help text "null"..." into jb-mr2-dev

* commit 'e8d12dd6b08ec5b3f2a18bee14171079c6c27e0d':
  Fix issue #8032572: Android app permission help text "null"...
am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev

* commit 'a0042742c8941519718cc8872a84cfec10294386':
  Modify restrictions bundle per api council recommendations
am b1e5137a: Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev

* commit 'b1e5137a807d19a9cbc241c0ba84c3c49b32fceb':
  Move owner info from Settings.Secure to LockSettings
am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev

* commit 'be8bc8392e203a661242b0637ce25bd05c292306':
  DO NOT MERGE Stripping some new widget API that is yet unused
am e1546df2: Merge "Fix message handling in RemoteControlClient" into jb-mr2-dev

* commit 'e1546df25a7de17195f5b38ca90cad8447c288d0':
  Fix message handling in RemoteControlClient
am bc09a364: Merge "Fixes for setClipBounds()" into jb-mr2-dev

* commit 'bc09a364c3fd49470b936e7bc2521f6de9ba07b4':
  Fixes for setClipBounds()
am 9bf7be93: Merge "Add permission check for owner-info related LockSettings." into jb-mr2-dev

* commit '9bf7be933d039ef227ca54f917c1ff6a00a2f833':
  Add permission check for owner-info related LockSettings.
am 18455c30: Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev

* commit '18455c307d8ea439dbf78aa3789380259ddd8572':
  Add input/output JSON data for baseline comparison
am bb7b315c: Merge "add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()" into jb-mr2-dev

* commit 'bb7b315cdd48fdcffc07d0e98557cb88b9f58006':
  add javadoc for SurfaceView {unL|l}ockCanvas{AndPost}()
am ab15e6ab: Merge "Add a config resource to force HDMI rotation on some devices." into jb-mr2-dev

* commit 'ab15e6ab37cb29e6f3653cc5fa1872523946c50e':
  Add a config resource to force HDMI rotation on some devices.
am d02b00dd: Merge "Fix UsbDebuggingActivity not shown in adb tcpip mode" into jb-mr2-dev

* commit 'd02b00dd6efd3841708cd72ae08e5d548b8cd07b':
  Fix UsbDebuggingActivity not shown in adb tcpip mode
am 25b49734: Merge "Fix issue #8540550: Screenshots should never have transparency" into jb-mr2-dev

* commit '25b49734cac1ecd17dba2af2a1af8328490236d4':
  Fix issue #8540550: Screenshots should never have transparency
am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev

* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
  Fix possible NPE
Fix wrong log information in DevicePolicyManagerService

When user reset password their password,
if password doesn't match target quality of device,
DPM print a log why can't reset password.
however log message isn't correct information.
in log context, it have to exist current quality
and target quality. this patch can help print correct log.

Change-Id: I5c8fb1c77ddbe1bdbc76e35038c897e2e8efb077
am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev

* commit '176c245cefaf08f33043e9b67cb787efeb6ad662':
  Hardware geofence API changes.
am 2b296319: Merge "Standardize gamepad layouts on existing controllers" into jb-mr2-dev

* commit '2b29631953d05c5202483817f5d2b07a26ddc14c':
  Standardize gamepad layouts on existing controllers
am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev

* commit '45d59a997f639662e4ce427933d81667fee39bcd':
  Make MediaDrm APIs public