Merge "Expose PreferenceManager constructor / Preference#performClick" into jb-mr1-aah-dev
am 38f7ae14: am f785af4d: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '38f7ae14dfff0004675383adde61f051e6483353':
  Import translations. DO NOT MERGE
am b18e19f5: am ee0f615f: am 99333315: Merge "Ensure we have a GL context before deleting View layers Bug #7391098" into jb-mr1-dev

* commit 'b18e19f5a018bfd59fdc2b2f0582698c9a6e5994':
am 82da5b17: am c0657fb3: Integrate changes from lockscreen proto app

* commit '82da5b173c586ce085a85421ebebdd281508f0ba':
  Integrate changes from lockscreen proto app
am 0234e9db: am 2ca85c20: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev

* commit '0234e9db974a05e93f691e2e613117867e59a79d':
am 446e66ed: am 9253f561: am 4e7f2ffe: Merge "Handle group tear down only at group removed event" into jb-mr1-dev

* commit '446e66edd8eb335d23697614102c80fe3fe94655':
am 662bf7b2: am eee20931: Beginnings of bouncer support; add scrims and state tracking

* commit '662bf7b23e74bb7b92c3ace8ddfdeea1a6791961':
  Beginnings of bouncer support; add scrims and state tracking
am 4dc794a7: am 5fbc82ef: am 38c904a6: Merge changes Ia0c2450f,I0fac062f into jb-mr1-dev

* commit '4dc794a779ab6d208e276b88a9a2f12ee5a4034e':
am 62778aaa: am db3efba6: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-dev

* commit '62778aaa0317f0bdfb6901e8e6493161717e9b2a':
am e88eebbb: am 147dfc86: Merge "Adding ability to add multiple widgets to keyguard" into jb-mr1-lockscreen-dev

* commit 'e88eebbb3ba8999cd81e79dc62a8dd14c64b592d':
  Adding ability to add multiple widgets to keyguard
am fc00e67c: am 8b3dd400: Fix build

* commit 'fc00e67cb0c2242920103162dfc4328fcfee74ed':
  Fix build
am cc5abfd4: am df99b1d5: Merge "Fix new password view in keyguard" into jb-mr1-lockscreen-dev

* commit 'cc5abfd4d6e62dd9c34f5aa8c6c08dfdab8a21ed':
  Fix new password view in keyguard
am 9e126b92: am 51d39f2d: Add ECA to PIN view

* commit '9e126b92513388331b8af969d2d6f80b0408f795':
  Add ECA to PIN view
am 51b0919d: am 2c1ce056: Cleaning up password input.

* commit '51b0919d301c10717c910928c5a03048e224f01f':
  Cleaning up password input.
am 165303f6: am d5692742: PIN pad cosmetics.

* commit '165303f6453e641b9ffe666d434c9ae581a8ab7e':
  PIN pad cosmetics.
am 033afa8c: am 661c2e74: am 33c0a616: Merge "Add text representation of ROUTE_TYPE_LIVE_VIDEO (for debugging)" into jb-mr1-dev

* commit '033afa8c818a877e28fbf809a573929bdc460b90':
am b6890d34: am 40d98edb: Merge "Haptics for PIN keys." into jb-mr1-lockscreen-dev

* commit 'b6890d341222b0d1d8a34b391fa1634d4cc353f7':
  Haptics for PIN keys.
am 25c0e692: am c57f0d3e: Merge "Haptics for PIN enter key" into jb-mr1-lockscreen-dev

* commit '25c0e69287c479253b7520304ee4508aa05acc62':
  Haptics for PIN enter key
am f78367e2: am e3b51ef0: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev

* commit 'f78367e2d2dd1d25a2c474308a953149a9a35c60':
am eb4c0cb5: am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev

* commit 'eb4c0cb5098bfceae762594621f4b5125ca7bbe4':
  Manual frameworks/base merge from lockhotness (camera).