am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '759445c5bdb2eb54af9e974f604226596976e078':
  Verify certificates
am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
  Verify certificates
am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

* commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
  Verify certificates
Fix stopBatchedScan not working for wifi

Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
Merge "Fix stopBatchedScan not working for wifi" into klp-dev
Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
Change wallpaper sizing

Bug: 11997581

- ignore suggested dimensions
- when orientation changes, scale up wallpaper if
it doesn't fill the whole screen, or scale back to
original size if not necessary

Change-Id: I75b7519a105d4097bf7a35cd8af61fc40f45f8fb
(cherry picked from commit 824a4b5ea4c58592b9b2ebe787f5fb6974e7cabe)
UsbDeviceManager: A better fix for race condition when starting USB accessory mode

On some devices, the USB "set configuration" command is propogated to the framework
after the "start accessory" event is received.  However, on other devices like
the 2011 ADK board, no "set configuration" command is sent at all until we have
reenumerated in acccessory mode.  To fix the original problem without breaking other
devices, we can simply remove assumptions about if or when "set configuration"
will be received.  Now we simply remain switch USB configuration to accessory mode
when we receive the "start accessory" command, and remain there until the existing
10 second timeout expires.

Bug: 13393825

Change-Id: I4c9e3423185bd7252a907e4568d9e3ff06044b7d
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"

This reverts commit fbd5521fb5e94fad066e21b9f91f4782afe71660.

This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start".  So we revert this change and will replace it with a better fix.

Bug: 13535051
Bug: 13393825

Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev
Eliminate mHasAlpha

 Bug: 13580771

 The cached value mHasAlpha on Bitmap could get out of sync with the
 real value stored in the SkBitmap. Fix this by just eliminating the
 cached value. This adds an extra JNI call in copy(), createBitmap(),
 and setPremultiplied(), none of which are going to be significantly
 impacted by the extra JNI call.

Change-Id: I4fce069a77d9b3bbb47dde04275ff8510ce7e4f0
Merge "Change wallpaper sizing" into klp-dev
Merge "Eliminate mHasAlpha" into klp-dev
Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev
Merge "Fix support for simultaneous VPN tuns" into klp-dev
Disable Set Wallpaper button while loading image

Bug: 13534714
Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
(cherry picked from commit 0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

The first set of these APIs is for telephony:

Added some APIs to ITelephony and created a first party framework for them

toggleHold()
merge()
mute(boolean mute)
playDtmfTone(char digit, boolean timedShortCode)
stopDtmfTone()
swap()
addListener(ITelephonyListener listener)
removeListener(ITelephonyListener listener)

Bug: 13302451
Change-Id: Iefec5688c26a1b4fe77f5643eba6e1690a057ee6