am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev

* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
  Final icon for notifications panel
Merge "Re-use existing thread" into jb-mr1.1-dev
docs: Add basic tool help pages for SDK and AVD Manager.
The SDK Manager page is needed particularly as a reference by
some pages rather than pointing to the installation guide.

Change-Id: Ie835e310f62cdc88bd6318e82f48e36bdd8e117a
am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.

* commit '4623c0d842403bf2ae4b622590325c3635aaf563':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
am 1af587b3: am 4623c0d8: docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.

* commit '1af587b346035320363a08c190f8b61a69cf0e7c':
  docs: Add basic tool help pages for SDK and AVD Manager. The SDK Manager page is needed particularly as a reference by some pages rather than pointing to the installation guide.
am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'db60b67533f0e8e0366a926204bc852412285320':
am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev

* commit '8f837a690b0da2579157cdcc30503e0dd67f429d':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit 'd44c4344aa85ece3443ffdd410e9619650cbd39f':
  Import translations. DO NOT MERGE
am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE

* commit '62e2374baa822bc98ef8e5ad8b10a55379433ef1':
am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev

* commit '2d09880d0352895dcd7ae3d4cdca95e4503b23ed':
am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev

* commit 'b524f4b928fe3ac9c71657a323cff4b3321344da':
  add some defensive code to enableUserSelectorIfNecessary.
am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev

* commit '8e3bf41d8b2289fa96ea1b268946bacaa01a620c':
  add logging to enableUserSelectorIfNecessary.
am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev

* commit 'eb6cbc22b264af26a20065942899a27abbc867eb':
am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev

* commit 'de974f6f201a9aed3f811c97edf4db3ecd41eb3d':
Support Wifi display devices that rename themselves.

Some Wifi display devices like to rename themselves after a
connection completes (or at other times).  Make sure to update
the name of the display when we detect that it changed in
our scan results.

This problem is somewhat complicated by the fact that we remember
the display name persistently, so we need to update our list
of remembered displays too.

Improve the state machine to avoid redundant attempts to
disconnect or cancel connection.

Bug: 7478895
Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev
audio service fix dock after crash - DO NOT MERGE

merge from master:
"audio service: set dock use on mediaserver restart

Restore forced usage of dock audio for media according to
current setting when media server restarts."

Bug 7485250.

Change-Id: Ie67b80ede1ed92d223dd96de83c1beb985dfba06
AudioService: undock audio glitch - DO NOT MERGE

merge from master:

"AudioService: improve low end dock audio control

Low end docks have a menu to enable use of audio
for media: automatically enabling/disabling use of audio
when the dock is connected/disconnected is useless
and can be the source of audio glitches.

Bug 7463620."

Change-Id: I3b7e7ebe660bb3f0e4367d2a3ed63ee76f78fe58
am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev

* commit '3fe2cb4db60827889abd1f971910f807ae346488':
  Don't cancel any notifications that are meant for all users, if no package is specified.
Reconcile with jb-mr1-release - do not merge

Change-Id: I5b5f12f167d5a0287dfd21c8f37f0f451c9242a4