am 2b4bc305: Merge "DO NOT MERGE Control access to tts objects" into jb-dev

* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
  DO NOT MERGE Control access to tts objects
Doc update: Appwidgets MR1 lockscreen support.

Change-Id: I637e27aa968614deb1e7f16399f459875ad04130
am 3e9cba4f: Merge "Deferring size callbacks until boot completed (issue 7469267)" into jb-mr1-dev

* commit '3e9cba4f9db96e3b5ba2ab2f9ad7a7ac2549582d':
  Deferring size callbacks until boot completed (issue 7469267)
am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev

* commit 'f69320a1f02de3106a26a3911c25be63fcfaf738':
  Preventing more than five widgets from being added in the carousel (issue 7502935)
Reduce emulator logspam

The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I30e0094dc3b24bc3ab6bc2799ce81ca0a6bb7d9d
Synchronize access to Locked methods. DO NOT MERGE

onConfigurationChange was calling maybeCreateKeyguardLocked
without actually holding the lock.  Now the call to
maybeCreateKeyguardLocked is synchronized.

May fix bug 7094175.

Change-Id: I3171a18e25f54506f614f9c2cc09aa20080bd6bb
Reconcile with jb-mr1-release - do not merge

Change-Id: I807fafdf3e52abcd291f3f8e593c92f8016ad2ef
Disable navbar searchlight if search assist not available.

Bug:7506441
Change-Id: I55c740d4c3a45b9f7fdfa38346d1bc3fb1299153
Emit event log message when switching users.

Change-Id: I8e521e177b0e17e2ab9e033e0ff8bc421cd5f784
Merge "Reduce emulator logspam" into jb-mr1.1-dev
am ba52aff4: Import translations. DO NOT MERGE

* commit 'ba52aff41b602a68cbe7baed1aeb1adf42f34139':
  Import translations. DO NOT MERGE
Increase readability of connectivity event log.

Bug: 6322766
Change-Id: I556759f5fc1466cdd4db6b4574084a8068dc9909
Merge "Emit event log message when switching users." into jb-mr1.1-dev
Reduce verbosity of service event logging.

Omits service name from destroyed events, since it can be derived by
looking back to the created event with the same ServiceRecord.

Change-Id: Ib7ab1031c0859437735e1fc985d58f47629b7ac4
docs: update Tools landing page with info for developer options

Change-Id: I1b2ce4e6a27b365a7ec8823fce56c613b1651b1d
Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev
When in vibrate mode, all notifications will vibrate.

(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444
am 85abb087: Merge "docs: update Tools landing page with info for developer options" into jb-mr1-dev

* commit '85abb087b9ffd05ff8ecc25575018f4a3fcb966d':
  docs: update Tools landing page with info for developer options
Merge "When in vibrate mode, all notifications will vibrate." into jb-mr1.1-dev
When in vibrate mode, all notifications will vibrate.

(Unless the notification specifies no ringtone AND no
vibration, in which case it will remain silent.)

Bug: 7516358
Change-Id: I926d0fe0165b9622cd117e6c3ef6e3637772b444