Reconcile with jb-mr1-release - do not merge

Change-Id: I290ad0de0601dc3c49366d7b9d44d9d30021559d
am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
  Import translations. DO NOT MERGE
am 32226b73: Import translations. DO NOT MERGE

* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
  Import translations. DO NOT MERGE
am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev

* commit 'afc5210a811da3824d75e32d998370203aba1968':
  Fix docs to refer to the correct class.
Notification.java javadoc: addAction

Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
Re-use existing thread

Bug: 7377541
Change-Id: I097f2288ebfc2b4a9782cbced19d9c36d0703acb
am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev

* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users
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':