Squashed deltas from cm 4.4.3 merge

Squashed commit of the following:

commit 5cdfa272bfd19585560186e12eeeba2bef7a748f
Merge: c86ffdb 09ad099
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Thu Jun 5 17:32:30 2014 +0100

    Merge tag '4.4.3_r1.1' into HEAD

commit c86ffdba38cbb4ff8c912241aa9f17e2761adfc2
Merge: 59a9fc5 99335b9
Author: Rajesh Yengisetty <rajesh@cyngn.com>
Date:   Wed Jun 4 23:41:53 2014 +0000

    Merge "UsbDebuggingManager : Handle race condition when toggling rapidly" into cm-11.0

commit 59a9fc5c1d6164af5856725ca0d494ce70e3ae4d
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Wed Jun 4 14:11:13 2014 -0400

    Themes: uninstallThemeForAllApps shouldn't check if map is empty if it's null

    Potential NPE introduced in ec2200878706735cdd2caf4d934d988296998e85

    Change-Id: I6d1ec165957c2be63086a18af2236e46978e9c8a

commit 09ad099ee536987c7599d4bc9b4f42a2b23fe434
Merge: 0322401 76593e1
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date:   Tue Jun 3 20:27:14 2014 +0100

    Merge tag 'android-4.4.3_r1' into HEAD

    Android 4.4.3 release 1

    Conflicts:
    	Android.mk
    	core/java/android/app/ContextImpl.java
    	core/java/android/app/WallpaperManager.java
    	core/java/android/view/ViewConfiguration.java
    	core/jni/android/graphics/Paint.cpp
    	core/res/res/values-fr-rCA/strings.xml
    	core/res/res/values-ru/strings.xml
    	core/res/res/values/config.xml
    	core/res/res/values/symbols.xml
    	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
    	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
    	services/java/com/android/server/BackupManagerService.java
    	services/java/com/android/server/ConnectivityService.java
    	services/java/com/android/server/am/ActiveServices.java
    	services/java/com/android/server/display/WifiDisplayController.java
    	services/java/com/android/server/pm/PackageManagerService.java
    	services/java/com/android/server/power/DisplayPowerController.java
    	telephony/java/android/telephony/TelephonyManager.java
    	telephony/java/com/android/internal/telephony/ITelephony.aidl

    Change-Id: Ib3f2a28b2a0ea869a541fe1cb25fd97281673839

commit 76593e19f9aeff5242f006c105a7e77e2cee33fd
Author: Mike Lockwood <lockwood@google.com>
Date:   Mon Apr 21 08:49:30 2014 -0700

    MTP: Fix getThumbnail

    The thumbnail size was not being passed to the MTP stack so getThumbnail
    was returning zero length data.

    Bug: 13747419

    Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5

commit f02d7bf71a41a5258a6266d5fa3b25b55f803aed
Author: Vinit Deshapnde <vinitd@google.com>
Date:   Thu Apr 17 11:05:21 2014 -0700

    Don't reset country code once it is persisted

    This change simply ignores resetting of country code by cellular
    networks to avoid disconnecting existing wifi connections. It also
    defers setting newly found country code until after existing Wifi
    connection is torn down.

    Also removes some dead code related to resetting of country codes.

    Bug: 13894807
    Change-Id: Ie2fcfdd4b3be8ba94542772c132fb1acb6a2c683

commit 9d6b121a4ededf003822bdfe7b12d7812a13d0ca
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Apr 1 12:05:11 2014 -0700

    Fix FLAG_DISMISS_KEYGUARD not working

    Fixes bug 13672528.

    Change-Id: I0292aee51d5d8755bbae926e5f0e6af1e22107dc

    Conflicts:
    	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

commit ba5f1f27890cea44b13cb79b50c2c3176d916708
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Thu Mar 27 18:16:32 2014 -0700

    Enlarge space allowed for internal downloads.

    Bug: 13673309
    Change-Id: Iefafe9abc9f116199f4a76d85bd0d7bfd872103d

commit ab4c3f1f91ce82c7b0418473720c1cb0481d53eb
Author: Selim Cinek <cinek@google.com>
Date:   Thu Mar 27 20:27:48 2014 +0100

    Fixed crash when setting wallpaper with built in rotation

    If an image had a built in rotation, a crash could occur,
    when setting it. An example was a panorama image which had
    a rotation of 90 degrees

    Change-Id: Iede8226dac3a40f08d39a69162eb388e6aba97ec
    Bug: 13507421

commit 45d2c30dec2e646b74b55d97f90b72f67ceb0604
Merge: ecad054 335c243
Author: The Android Automerger <android-build@google.com>
Date:   Tue Mar 25 17:07:08 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit ecad0541a6e90b98ad96456c4e6992121ee8a789
Merge: 6f955df 965bed1
Author: Eino-Ville Talvala <etalvala@google.com>
Date:   Tue Mar 25 18:57:08 2014 +0000

    Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev

commit 6f955df8e632aabeef312d488b7ebbad25d8a2d8
Merge: 2b2395f 550b44d
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 17:48:38 2014 +0000

    am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '550b44d1884c5f65187dbc8bf8d4e6090f302a7b':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 550b44d1884c5f65187dbc8bf8d4e6090f302a7b
Merge: 5035fab f464418
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 10:42:38 2014 -0700

    am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit 'f4644189f665f221e8033587811e58f12e2ccc86':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit f4644189f665f221e8033587811e58f12e2ccc86
Merge: cecc620 4cf6286
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 10:36:04 2014 -0700

    am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 4cf6286c3ccfe63bf73e6a1fb33e67d1becd16be
Merge: 759445c 02c7ba7
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 10:29:48 2014 -0700

    am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '02c7ba73e8733def289535b6d13dc6a504a0443f':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 02c7ba73e8733def289535b6d13dc6a504a0443f
Merge: c53ad4c 41bb063
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 10:22:56 2014 -0700

    am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '41bb0637ca430808ab40a0300467ea58ae0a05c3':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 2b2395f39a7a3b271f7d1072acec64db1554694e
Merge: 81e094d 9bc5f2f
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 17:22:55 2014 +0000

    Merge "Don't wait for finishing animation when second display is disconnected" into klp-dev

commit 9bc5f2f457844bd75747be40bd4593a2378d7c3d
Author: Koji Fukui <koji.fukui@sonymobile.com>
Date:   Fri Mar 14 21:20:21 2014 +0900

    Don't wait for finishing animation when second display is disconnected

    Basically WindowManagerService wait for finishing animation when
    a window is removed. But when second display is disconnected, windows
    on second display can't be shown even if animation is waited for.
    On the contrary, it keeps on waiting for finishing the animation
    in special case.

    With this fix windows are immediately removed without waiting for
    animation when second display is disconnected.

    (Cherry picked from aosp 39f7068ed903f747d6885117dc1bac69f626ae91)

    Change-Id: I1354c193c04db394a21a11c174e10c8e7da17a0e

    Fixes bug: b/13632129

commit 41bb0637ca430808ab40a0300467ea58ae0a05c3
Merge: 072e1da 76e85ee
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 10:04:07 2014 -0700

    am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '76e85eec845ff3688e6fd5b7bafbb5934530df4b':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 76e85eec845ff3688e6fd5b7bafbb5934530df4b
Merge: b17cf20 3bc9971
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 09:58:17 2014 -0700

    am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '3bc9971d707839f2d26e601082d654242295002d':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 3bc9971d707839f2d26e601082d654242295002d
Merge: 9ee72b6 95d6e32
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 09:52:28 2014 -0700

    am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '95d6e32bc3c5382740a6bb418f77cf7147d833f7':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 81e094d76b9220e335edc24599919f8cd0f5d317
Merge: 8907801 9702432
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 16:48:38 2014 +0000

    Merge "Move task to top in window manager." into klp-dev

commit 95d6e32bc3c5382740a6bb418f77cf7147d833f7
Merge: 665b075 86f9a93
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 09:48:27 2014 -0700

    am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

    * commit '86f9a93e20bf33b9f5152592f4781bd253be8643':
      Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

commit 8907801268b62dfadaf8c9f73d60ffaea6dbf904
Merge: bb87ac7 077587f
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Mar 25 16:47:23 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 86f9a93e20bf33b9f5152592f4781bd253be8643
Merge: 81fbdad 0392442
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Mar 25 16:43:40 2014 +0000

    Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev

commit bb87ac7f9733ca9b490cb34e8a675dba083a57b7
Author: Matthew Williams <mjwilliams@google.com>
Date:   Mon Mar 24 14:42:06 2014 -0700

    DO NOT MERGE: Downgrade expedited to normal on reschedule.

    bug: 12033540
    Expedited was previously tracked by a redundant internal variable, ostensibly
    as an optimisation. This variable could differ from the value in the bundle
    depending on how the operation is initialised, which led to confusion. Now an
    expedited sync will only be treated as such on its first execution.

    Change-Id: Ibfc4e9e49b86c82f2364a6ef55f887705a053eb6

commit 077587fb50ff87ca663cef0d68dda065a86b1e26
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Mar 24 09:46:08 2014 -0700

    Import translations. DO NOT MERGE

    Change-Id: I0b32878886c66eb9fdd22bf332786e140d334533
    Auto-generated-cl: translation import

commit 335c243b84485d1194efb60c41852988f24902ff
Merge: 83da75d 774eb08
Author: The Android Automerger <android-build@google.com>
Date:   Mon Mar 24 06:01:04 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit c41853cee89b391cd2d4d93205ea69c746ccfa4c
Author: Selim Cinek <cinek@google.com>
Date:   Mon Mar 24 13:53:06 2014 +0100

    Fixed wallpaper bug where wrong size was taken when cropping

    When cropping, the selected area of the image was incorrectly
    cropped to the size of the view instead of the size of the image

    Bug: 13617446
    Change-Id: If54a0891fa2cdeee70ba63752874f1543d401701

commit 0392442de8295caf1b9ce9dc5fb19f9798b54972
Author: Craig Mautner <cmautner@google.com>
Date:   Wed Mar 19 19:48:38 2014 -0700

    Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs

    Previous fix to keep non-show-when-locked windows hid dialogs from
    activities that had asked to be show-when-locked. That was too
    restrictive.

    Fixes bug 13225149.

    Change-Id: I39ae9d7cbcc9b5109257f732d027bda3a2de65e4

commit 83da75d938d519bbcffb9c3b52802fd2daad4aee
Author: Gabriel Peal <gpeal@google.com>
Date:   Wed Mar 19 16:41:49 2014 -0700

    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

commit 965bed1c2cfc8577eb77803f3e8169c17a5fbbd2
Author: Igor Murashkin <iam@google.com>
Date:   Tue Mar 18 18:14:41 2014 -0700

    DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values

    Bug: 12609188
    Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da

commit ba126c09a5c00cb0a96da6ece0b4ab4d7ed2d8cb
Author: Selim Cinek <cinek@google.com>
Date:   Fri Mar 21 19:19:08 2014 +0100

    Disable Set Wallpaper button while loading image

    Bug: 13534714
    Change-Id: I45ff3436de40ea85fb22d776584d9f30f0795898
    (cherry picked from commit 0fa6c1b146f7ed1aba335c30878e2c1b2bf2a8f1)

commit 1aad3ad4ec2137c5aa043f96ccc621a4faffeb56
Merge: de4e7b4 4c5c33e
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Fri Mar 21 20:52:14 2014 +0000

    Merge "Fix support for simultaneous VPN tuns" into klp-dev

commit de4e7b4947998638e0345ab9a181bf35a8827bef
Merge: abf701e 1b66923
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Fri Mar 21 20:52:04 2014 +0000

    Merge "Include the interface for clearDnsInterfaceForUidRange" into klp-dev

commit abf701e6751aed487d4ed0986e0fae8810c3658f
Merge: 1a70f39 91f0a45
Author: John Reck <jreck@google.com>
Date:   Fri Mar 21 19:37:27 2014 +0000

    Merge "Eliminate mHasAlpha" into klp-dev

commit 1a70f391608e82fcc5550c76ccc7bf8bac5bbc10
Merge: 3f52322 3368a63
Author: Unsuk Jung <unsuk@google.com>
Date:   Fri Mar 21 19:01:08 2014 +0000

    Merge "Change wallpaper sizing" into klp-dev

commit 91f0a455bb6670b59b8d15cc7a9adb0e6d7f146d
Author: John Reck <jreck@google.com>
Date:   Fri Mar 21 11:09:45 2014 -0700

    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

commit 3f5232220f2db839f690489ed272113f660daa40
Merge: dffdf10 42c32c0
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Fri Mar 21 17:47:00 2014 +0000

    Merge "Lock down MANAGE_DOCUMENTS permission." into klp-dev

commit 774eb080852177a129a0b749d71b47f2f3004d30
Author: Mike Lockwood <lockwood@google.com>
Date:   Wed Mar 19 16:56:18 2014 -0700

    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

commit e2934fc4838333ff0972bbbe5e12a111db66dd31
Author: Mike Lockwood <lockwood@google.com>
Date:   Thu Mar 20 11:14:08 2014 -0700

    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

commit 3368a63c640c059b85b39c7def8f9c63ad921cb5
Author: Michael Jurka <mikejurka@google.com>
Date:   Wed Dec 18 17:10:16 2013 +0100

    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)

commit dffdf1079da76f532cd6e72bf537c1a69b099c7e
Merge: afc3a5d d8be490
Author: Mike Lockwood <lockwood@google.com>
Date:   Fri Mar 21 01:06:16 2014 +0000

    Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev

commit afc3a5d386459667f87d764038dd30e3490c64c2
Merge: 058061d 205a3ea
Author: Mike Lockwood <lockwood@google.com>
Date:   Fri Mar 21 01:05:56 2014 +0000

    Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev

commit 058061da46db0fdac8ea53c463a6b615fde3e928
Merge: 4932530 d181673
Author: Wei Wang <weiwa@google.com>
Date:   Fri Mar 21 00:37:33 2014 +0000

    Merge "Fix stopBatchedScan not working for wifi" into klp-dev

commit 49325305905198b9d077ccc784be96e5684e3623
Merge: 7cd5289 f503a2d
Author: Adam Powell <adamp@google.com>
Date:   Fri Mar 21 00:19:11 2014 +0000

    Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev

commit d181673e2872ef4f4c47c109880cc9c03d2fd1ec
Author: Wei Wang <weiwa@google.com>
Date:   Thu Mar 20 16:27:01 2014 -0700

    Fix stopBatchedScan not working for wifi

    Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804

commit 7cd52895ec3e014c1097852725ba68646c1d6665
Merge: 52bc363 5035fab
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 20:36:34 2014 +0000

    am 5035faba: (-s ours) am cecc6208: am 759445c5: resolved conflicts for merge of c53ad4cd to jb-mr2-dev

    * commit '5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
      Verify certificates

commit 5035faba9a28f988291c4ff3d3cbf64d828f3f5a
Merge: e9c7fd2 cecc620
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 13:22:34 2014 -0700

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

    * commit 'cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
      Verify certificates

commit cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7
Merge: 55371be 759445c
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 13:16:32 2014 -0700

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

    * commit '759445c5bdb2eb54af9e974f604226596976e078':
      Verify certificates

commit 759445c5bdb2eb54af9e974f604226596976e078
Merge: 754bf6a c53ad4c
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 12:51:55 2014 -0700

    resolved conflicts for merge of c53ad4cd to jb-mr2-dev

    Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff

commit d8be49089fbbce0485625bbac906488dac35266d
Author: Mike Lockwood <lockwood@google.com>
Date:   Thu Mar 20 11:14:08 2014 -0700

    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

commit 205a3ea0e2c49bc4d0ed534469f3a6920c14c4fe
Author: Mike Lockwood <lockwood@google.com>
Date:   Wed Mar 19 16:56:18 2014 -0700

    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

commit 52bc363cf3a7de8431cfbb370f0fd3adeecaed52
Merge: d16505d 45b97c2
Author: Vinit Deshapnde <vinitd@google.com>
Date:   Thu Mar 20 19:26:44 2014 +0000

    Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev

commit d16505da8676b54dd354da278b1888f28257028b
Merge: c0384b6 7cf3e33
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Mar 20 18:32:35 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit c53ad4cd807e74897ba2d7b799cb8ff6824b34e8
Merge: c8868db 072e1da
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 11:11:16 2014 -0700

    am 072e1da2: am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

    * commit '072e1da26e80adb4009d063428c2ef8fb65c3d6c':
      Verify certificates

commit 072e1da26e80adb4009d063428c2ef8fb65c3d6c
Merge: 737d3e5 b17cf20
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 11:06:41 2014 -0700

    am b17cf207: am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

    * commit 'b17cf207372268d91177de7efa692b2483785991':
      Verify certificates

commit b17cf207372268d91177de7efa692b2483785991
Merge: 6b96ecc 9ee72b6
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 10:54:38 2014 -0700

    am 9ee72b65: am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

    * commit '9ee72b65436242ab4f8f4ceb904ea5078779416c':
      Verify certificates

commit 9ee72b65436242ab4f8f4ceb904ea5078779416c
Merge: 32753f4 665b075
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 10:51:35 2014 -0700

    am 665b0757: am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

    * commit '665b07579aa2a74bb5425d543892da40d78b7ef8':
      Verify certificates

commit 665b07579aa2a74bb5425d543892da40d78b7ef8
Merge: 3191212 81fbdad
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 10:47:34 2014 -0700

    am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

    * commit '81fbdade8db4117157ea48602be121e6cf5597dd':
      Verify certificates

commit 81fbdade8db4117157ea48602be121e6cf5597dd
Merge: 6eb2810 534f3e9
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 10:27:58 2014 -0700

    resolved conflicts for merge of 534f3e94 to jb-mr1-dev

    Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394

commit 97024321fcff3427e4e1cc6ced9b6abc7525fdb0
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 20 10:08:04 2014 -0700

    Move task to top in window manager.

    In certain situations it was possible for a task to move to the top
    in activity manager but not in window manager. This resulted in
    the task appearing behind the launcher icons.

    Fixes bug 13410184.

    Change-Id: If0582b395e126a8aff70a0e4c64b731083c6ae8a

commit 534f3e9438a0e2e97df2d371be834d65720b2eb9
Merge: 183f97b a3337bc
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 10:04:23 2014 -0700

    am a3337bc7: Merge "Verify certificates" into jb-dev

    * commit 'a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
      Verify certificates

commit a3337bc7c3a98ec12b6dec281e26c34f82025bdd
Merge: 1c12f9e c936d73
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 20 16:58:36 2014 +0000

    Merge "Verify certificates" into jb-dev

commit f503a2d47f9c3256d43eacf10fce56aacfcc4554
Author: Adam Powell <adamp@google.com>
Date:   Wed Mar 19 17:35:25 2014 -0700

    Update contextual asset bar assets to avoid 9-patch artifacts

    Asset drop from UX

    Bug 11879853

    Change-Id: I8190340900a16ae41135ec1231e36e959603e165

commit c0384b6b18617cc395814c5b20077955a185e392
Author: Wei Wang <weiwa@google.com>
Date:   Wed Mar 19 15:47:12 2014 -0700

    DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050
    Cherrypick from master to fix b/13289050

    Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2

commit da084104eb768f4472b7988b77a4f2b7e3f170d8
Merge: 46e6311 4b4eebb
Author: Wei Wang <weiwa@google.com>
Date:   Thu Mar 20 03:27:46 2014 +0000

    Merge "DO NOT MERGE:  Add status callback for start/stop advertising." into klp-dev

commit 46e631178e3420fee182e7d9d1ddfdbca9355bc1
Author: Jim Miller <jaggies@google.com>
Date:   Mon Dec 9 17:38:05 2013 -0800

    DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService

    This fixes a bug where an allocated DeathRecipient in WindowManagerService
    was holding a reference to keyguard binder interface after a call to
    linkToDeath() without a matchin unlinkToDeath().

    It was causing the keyguard side of the binder interface to stick around,
    which in tern prevented the keyguard side from releasing its references.

    The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.

    Fixes bug 11982048

    Change-Id: I6959816b819ba953512c53675162195cbf1e0653

commit a413a4ae3280be6c45e84e85d7be3379a5cb51e4
Author: Jim Miller <jaggies@google.com>
Date:   Wed Mar 19 18:37:36 2014 -0700

    Fix the build.  DO NOT MERGE

    Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747

commit 89513ee544cd6373496179758e09954af0ba217d
Merge: 2598fbd 5d39a77
Author: Chris Craik <ccraik@google.com>
Date:   Thu Mar 20 01:04:57 2014 +0000

    Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev

commit 2598fbd71a2109ab307d32935a13fa1eab150e8d
Merge: 610d401 6f29b30
Author: Jim Miller <jaggies@google.com>
Date:   Thu Mar 20 01:04:12 2014 +0000

    Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev

commit 4b4eebb9a5185a8ea5593a797400960e5258a57e
Author: Wei Wang <weiwa@google.com>
Date:   Tue Mar 11 22:22:41 2014 -0700

    DO NOT MERGE:  Add status callback for start/stop advertising.

    Cherrypick from master to fix b/13289050

    Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77

    Conflicts:
    	core/java/android/bluetooth/BluetoothAdapter.java
    	core/java/android/bluetooth/BluetoothGatt.java

commit 610d401cb580ee233c008acf8fc076047a0ffdb4
Merge: d4375b4 e9c7fd2
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 22:27:06 2014 +0000

    am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit 'e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10':
      malloc some advances

commit e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10
Merge: 1f3186e 55371be
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 15:21:09 2014 -0700

    am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '55371beb024ae402831898f8788e4293f52dd832':
      malloc some advances

commit 55371beb024ae402831898f8788e4293f52dd832
Merge: 67a9297 754bf6a
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 15:14:07 2014 -0700

    am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2':
      malloc some advances

commit 754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2
Merge: 88da2bf c8868db
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 15:08:32 2014 -0700

    am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
      malloc some advances

commit 45b97c2c99f89095861c0521fd6be4ab472aeee1
Author: Vinit Deshapnde <vinitd@google.com>
Date:   Wed Mar 19 15:04:49 2014 -0700

    DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns

    This helps in reducing overt scans when cell network is unavailable; and
    in turn helps alleviate some regulatory concerns.

    BUG: 11062898

    Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b

commit c8868db2a025a97e439f8a9adde565c9c83f2204
Merge: ed529a5 737d3e5
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 15:03:28 2014 -0700

    am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '737d3e5da366124d164555009fa5ee4552143cc8':
      malloc some advances

commit 737d3e5da366124d164555009fa5ee4552143cc8
Merge: 500ec9c 6b96ecc
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 14:57:36 2014 -0700

    am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
      malloc some advances

commit 6b96ecca90555e04da8a4477d6dc6de83e7b9ee1
Merge: 25fb713 32753f4
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 14:51:58 2014 -0700

    am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
      malloc some advances

commit 32753f4f1c0dfd810d68759cce3e51cf788084f8
Merge: 0b2f212 3191212
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 14:47:23 2014 -0700

    am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '3191212259b1629cf8174416adf01522b88501ad':
      malloc some advances

commit 3191212259b1629cf8174416adf01522b88501ad
Merge: d3da8f7 6eb2810
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 14:40:17 2014 -0700

    am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
      malloc some advances

commit d4375b4713658c06001e9dba7105804c872fc199
Merge: f7b33e8 b4998ee
Author: Craig Mautner <cmautner@google.com>
Date:   Wed Mar 19 21:37:07 2014 +0000

    Merge "Fix loop limits." into klp-dev

commit 6eb2810318262ff36014c52384ed3cdea19bd34e
Merge: ecba937 183f97b
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 14:32:15 2014 -0700

    am 183f97b7: am 1c12f9e7: malloc some advances

    * commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
      malloc some advances

commit 183f97b72faf7a0f45ad66e1b3fd9a4343cc7482
Merge: da37ed8 1c12f9e
Author: Victoria Lease <violets@google.com>
Date:   Wed Mar 19 14:27:19 2014 -0700

    am 1c12f9e7: malloc some advances

    * commit '1c12f9e76298c757423155ad812890d27effafe8':
      malloc some advances

commit b4998eec3c0b8f7364fa729ebae84fd0b9dc2546
Author: Craig Mautner <cmautner@google.com>
Date:   Wed Dec 18 16:43:51 2013 -0800

    Fix loop limits.

    Fixes bug 12207606.

    Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299

commit f7b33e8656599ed3e0edd834a03a0366b0f655bb
Merge: 55b523c 0cab07d
Author: Lajos Molnar <lajos@google.com>
Date:   Wed Mar 19 20:43:22 2014 +0000

    Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev

commit 55b523cc3fac7fd008094b690a0fa8c5527d569c
Merge: 8acbe88 c82618c
Author: Adam Cohen <adamcohen@google.com>
Date:   Wed Mar 19 20:16:10 2014 +0000

    Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev

commit 8acbe8887a753c0d2e86153d00cf426781c19cf2
Merge: f260ed0 929e75e
Author: Adam Cohen <adamcohen@google.com>
Date:   Wed Mar 19 20:15:41 2014 +0000

    Merge "[DO NOT MERGE] Centering the crop by default in system wallpaper cropper" into klp-dev

commit 5d39a77992ba6573fbc0cd4d85e0390bb5feb637
Author: Chris Craik <ccraik@google.com>
Date:   Wed Jan 29 13:00:33 2014 -0800

    Fix projection offset caching - DO NOT MERGE

    bug:13214038

    Because the caching of projection matrix didn't account for changes in
    the offset flag, the flag could be ignored. Now we use both to verify
    that the cached matrix can be used.

    Change-Id: I193b94eaf0b98f046a6484f0866c3d25048653fd
    (cherry picked from commit d04a6b15f74035fd2068f34225825b55e94521f4)

commit f260ed09263d60ff941225e31e22d344afd90c0f
Merge: 5d3d4ee aba5665
Author: Jeff Brown <jeffbrown@google.com>
Date:   Wed Mar 19 20:01:42 2014 +0000

    Merge "Fix inverted conditional in View.setFilterTouchesWhenObscured." into klp-dev

commit 0cab07d78844b71caa2b33d2fac3ab85de77ac2a
Author: Lajos Molnar <lajos@google.com>
Date:   Mon Mar 10 17:21:49 2014 -0700

    MediaPlayer: fix int overflow issue in MediaTimeProvider

    Bug: 13394783
    Change-Id: I228ded5cf198852fda867d136cd8b1aacd8b6584

commit 929e75e8d0c258ca134093413ed0d8ffb3ead1d4
Author: Michael Jurka <mikejurka@google.com>
Date:   Tue Jan 14 14:48:20 2014 +0100

    [DO NOT MERGE] Centering the crop by default in system wallpaper cropper

    Bug: 12034934

    Change-Id: Ice1b1140bd6e351dd4e520f555f245d84a645aac
    (cherry picked from commit 2ab14daebac46307d2364733481edc3115bbf98c)

commit c82618c660bbb76df05c11c548cc01724f5e5fc9
Author: Michael Jurka <mikejurka@google.com>
Date:   Mon Dec 2 15:05:44 2013 -0800

    [DO NOT MERGE] Fix wallpaper cropping bugs

    - take into account that image decoder might not
    respect inSampleSize
    - check rounded values so we don't have crop rects
    that lie outside a bitmap's dimensions
    - correctly set initial scale on bitmaps that are
    larger than the screen size
    - switch to using asynctask when setting wallpaper
    dimensions
    (cherry picked from commit e39c9a953ca11319b747b3aa79f4ccd082b775b7)

    Change-Id: I43372f0bff37f139c8bc83f9956a967d0b4a8708

commit 7cf3e334bed414b4a46f59682a53de5ede982fa1
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Mar 19 09:48:18 2014 -0700

    Import translations. DO NOT MERGE

    Change-Id: I2a993d03ba28b42348c201919c4d1ab6bae23445
    Auto-generated-cl: translation import

commit 5d3d4ee3005e910dce780074d3f68d594aa12070
Merge: b78dc69 c8e8e3e
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Wed Mar 19 16:12:01 2014 +0000

    Merge "Handle provisioning APN by turning off/on data." into klp-dev

commit b78dc69c2be43852dcd7150db2b545f9b4110232
Merge: 98a027a 4d46083
Author: Dan Sandler <dsandler@android.com>
Date:   Wed Mar 19 13:04:00 2014 +0000

    Merge "DO NOT MERGE: Maintain binding to crashed listeners." into klp-dev

commit aba566589e0011c4b973c0d4f77be4e9ee176089
Author: Jeff Brown <jeffbrown@google.com>
Date:   Tue Mar 18 17:58:38 2014 -0700

    Fix inverted conditional in View.setFilterTouchesWhenObscured.

    Bug: 13530806
    Change-Id: Icdaf909c355f5b22635e1060f2190502916b144f

commit 98a027a506b5acff1a7ab0cc3655399da7d025c7
Merge: 4cb1bc2 97121c9
Author: Dave Platt <dplatt@google.com>
Date:   Wed Mar 19 00:50:29 2014 +0000

    Merge "Harden NsdManager against null-dereference crashes" into klp-dev

commit 4cb1bc2877f8562e6d349a6c737a3055ef4eaa29
Merge: 9b65070 f1e8d36
Author: Jeff Brown <jeffbrown@google.com>
Date:   Wed Mar 19 00:19:38 2014 +0000

    Merge "Refresh cast icon assets to improve visual contrast." into klp-dev

commit 9b650702113f8a17e09940c3802de71a9fc62ff1
Merge: ac275cb 01f03b5
Author: Xia Wang <xiaw@google.com>
Date:   Tue Mar 18 22:10:32 2014 +0000

    Merge "Fix state transition verification." into klp-dev

commit f1e8d3632775aca95fb00b1a4a085119a6b0c01e
Author: Jeff Brown <jeffbrown@google.com>
Date:   Tue Mar 18 13:41:31 2014 -0700

    Refresh cast icon assets to improve visual contrast.

    Bug: 13473719
    Change-Id: Ia82b2bc487a612f24bbe47f7d6e9182e862bcefa

commit ac275cb3d8184e83228899280bb8901e30f3a5f2
Merge: 6532523 1f3186e
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 21:03:15 2014 +0000

    am 1f3186ee: (-s ours) am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit '1f3186ee4505997ef3a235f669313236099308f4':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit 1f3186ee4505997ef3a235f669313236099308f4
Merge: 3b9de0a 67a9297
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:59:28 2014 -0700

    am 67a92975: am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit '67a92975ac638db3d51ea4978cf78ee207fcceb7':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit 67a92975ac638db3d51ea4978cf78ee207fcceb7
Merge: 00e12e6 88da2bf
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:53:17 2014 -0700

    am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit '88da2bfaacaafebdd2e0fb9542386486b9594871':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit 88da2bfaacaafebdd2e0fb9542386486b9594871
Merge: 1066fc6 ed529a5
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:47:58 2014 -0700

    am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b
Merge: ad63d91 500ec9c
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:41:20 2014 -0700

    am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit '500ec9ce4b7856eca480c4c7dca8df1211614102':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit 500ec9ce4b7856eca480c4c7dca8df1211614102
Merge: 20a4f49 25fb713
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:34:05 2014 -0700

    am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit '25fb7133901f6a538d5d365f3c0c1c936e76679d':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit 25fb7133901f6a538d5d365f3c0c1c936e76679d
Merge: 817f558 0b2f212
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:28:17 2014 -0700

    am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit '0b2f212204bd71700a4a32b87ac2d4c6a0c56feb':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit 0b2f212204bd71700a4a32b87ac2d4c6a0c56feb
Merge: 3d958f8 d3da8f7
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:24:35 2014 -0700

    am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit 'd3da8f711ec642322e497a493985bed5c43f597b':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit d3da8f711ec642322e497a493985bed5c43f597b
Merge: 468e8e9 ecba937
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 13:17:12 2014 -0700

    am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

    * commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
      DO NOT MERGE - Fix keyguard pattern lockout bug

commit 01f03b50fb8adac275b6e73abe92c8a926f5b602
Author: Xia Wang <xiaw@google.com>
Date:   Tue Mar 4 11:29:18 2014 -0800

    Fix state transition verification.

    When there is connectivity state change, the network states could be broadcasted multiple times.
    The state transition should consider that.

    Bug: 13277256
    Change-Id: I3d400900a0e2454f9d198629f1c062cbb15bdcd8
    (cherry picked from commit 71aae0b6fd1bb9204b81c2e9447f3544c29579c4)

commit 42c32c0c88e4049a358b0a2bf6e6a5881ee206b8
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Tue Feb 18 14:25:47 2014 -0800

    Lock down MANAGE_DOCUMENTS permission.

    MANAGE_DOCUMENTS is a very broad permission, since it allows full
    access to all DocumentsProviders.  DocumentsUI should really be the
    only app holding this permission; everyone else should rely on Uri
    permission grants for access.

    Bug: 12958298
    Change-Id: I1def48a4ea1814e031fc8513c3cd051d764cd7f8

commit c8e8e3eba631ab2528fc91ef66f150b7eebddeae
Author: Wink Saville <wink@google.com>
Date:   Thu Mar 13 06:54:59 2014 -0700

    Handle provisioning APN by turning off/on data.

    This is a start and two tests succeed:

    Tested expired AT&T SIM and waiting 15min for alarm to fire.
    Tested a provisioned Verizon SIM and works normally.

    I've NOT tested AT&T where I've properly completed the provisioning.
    I've NOT tested T-Mobile SIM either provisioned or not-provisioned.
    I've NOT tested provisioning over WiFi.
    I've NOT tested that WiFi <-> Mobile works
    I've NOT tested voice calls, SMS, MMS
    ...

    The current bug is below, but it is poorly named either it should be
    renamed or a new bug created.

    Bug: 13190133
    Change-Id: I0a09f642614cd27a8655e9dae764b8999ce485b8

commit ecba937b005b07d72eadfaf93a200e0b14af2980
Author: Adrian Roos <roosa@google.com>
Date:   Tue Mar 18 18:33:14 2014 +0100

    DO NOT MERGE - Fix keyguard pattern lockout bug

    (cherry picked from commit 91c9561cbe665f91e1665f30362c409ae180b127)

    Bug: 13302967
    Change-Id: I35e7319f8767b2320dc11d9bfe8dc034e2a39b28

commit 1c12f9e76298c757423155ad812890d27effafe8
Author: Victoria Lease <violets@google.com>
Date:   Mon Mar 17 16:03:28 2014 -0700

    malloc some advances

    Bug: 13506939
    Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5
    (cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)

commit 4d460833b955fcb669c59d4384bdf7938cc71705
Author: Dan Sandler <dsandler@android.com>
Date:   Fri Mar 14 14:48:31 2014 -0400

    DO NOT MERGE: Maintain binding to crashed listeners.

    Adapted from change I44ce250e, "Maintain binding to crashed
    listeners from NotificationManagerService.":

    > This fixes the logic on the death handlers for notification
    > listeners, and doesn't unbind from the listener services so
    > that the system will bring them back up again.

    Bug: 12587702
    Change-Id: I41d0c6733046ee9760bcfae4407e754592b805ea

commit c936d73adbd0fe9c698b89fe1a71d950fd89c935
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 13 14:18:59 2014 -0700

    Verify certificates

    b/13418320

    Cherrypicked from 7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
    https://googleplex-android-review.git.corp.google.com/#/c/433316/

    Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c

commit 6532523652cf16d3e498939965defab4bd22c491
Author: Geoff Mendal <mendal@google.com>
Date:   Mon Mar 17 09:34:19 2014 -0700

    Import translations. DO NOT MERGE

    Change-Id: I0b2d6484e67628d26f34d3be39b8b11f009151bd
    Auto-generated-cl: translation import

commit 4c5c33e5e6fb37f85977c70a0baba4e1ed51fe0d
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Fri Feb 21 11:04:45 2014 -0800

    Fix support for simultaneous VPN tuns

    A VPN can once again bring up a new tun interface while the old tun is
    running. Once the new tun is set up the routing rules will be removed from the
    old tun. It is up to the application to drain the old tun of traffic and
    close it.

    If the new tun fails to come up the old tun will remain untouched and
    can still be used.

    To prevent leakage the new rules are added before the old tun is
    shutdown. Netd/Dns has been changed to allow multiple rules to exist
    at once with the most recently added rule taking priority.

    Bug: 12134439
    Change-Id: I7e00c7c68cc339d81f09b3d2a33276ffc76985f5

commit 1b66923148130dec7139175a3bf4c4d534cabac4
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Thu Feb 20 14:46:33 2014 -0800

    Include the interface for clearDnsInterfaceForUidRange

    With netd allowing overlapping rules for uid range rules the interface
    name is needed to make sure only the correct rule is removed.

    Bug: 12134439
    Change-Id: I94f77f154f49ca8d5f6cf49683a4473cc92c3eb7

commit 477897ad7b0725fa68d32a94bf8c24264068fd5c
Merge: 10a07a0 fdf28cc
Author: Craig Mautner <cmautner@google.com>
Date:   Fri Mar 14 22:30:04 2014 +0000

    Merge "Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE." into klp-dev

commit fdf28cc4be5acab6e4a050b27742435dfe7ae0de
Author: Craig Mautner <cmautner@google.com>
Date:   Mon Dec 16 15:58:31 2013 -0800

    Fix incorrect setting of TaskRecord.frontOfTask.  DO NOT MERGE.

    When Intent.FLAG_ACTIVITY_REORDER_TO_FRONT was set the TaskRecord
    member frontOfTask was being set true incorrectly for the top
    activity. It should only be true for the bottom activity. This fix
    ensures that frontOfTask is always set correctly for all activities by
    consoldating it into one method.

    Fixes bug 12171535.

    Change-Id: If982dad3c81b2b816adc5d89e7e0496923098a70

commit 10a07a043f7fa47148ae2cc2fcd6b0edeb52190b
Merge: 09421fa 7e435a0
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Mar 14 22:27:22 2014 +0000

    Merge "Verify certificates" into klp-dev

commit 09421fab0784bcfc6660a09d02faea7835c28e31
Author: Daniel 2 Olofsson <daniel2.olofsson@sonymobile.com>
Date:   Tue Aug 13 10:30:26 2013 +0200

    Re-initialize error after attach

    If flag for error after attach is not reinitialized, it may cause
    NullPointerException on subsequent onAttachedWindow if error text
    was reset to null.

    Change-Id: I8976c28a6ca71017e5c4b3f29d4eeeb2eda48c38

commit eb95e74e21a0e910704ca2fd67e074ab640bfba3
Author: Selim Cinek <cinek@google.com>
Date:   Fri Mar 14 18:42:48 2014 +0100

    DO NOT MERGE - Fixed crash for odd image width/height

    Due to an internal rounding in the renderer, the calculations
    for the cropping area could be slightly offset, getting out
    of the image boundaries. I sanitized the rect by ensuring they
    are inside the image.

    Bug: 12174629
    Change-Id: Icc37790732ddd479631b898b23c05501d2dcd5be

commit ff89d589c7eb32265bf70068ffaef24104a580a5
Merge: 51b921d 3b9de0a
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 21:09:35 2014 -0700

    Merge commit '3b9de0a4' into manualmerge

    Conflicts:
    	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

    Change-Id: I5433912e9d97a20bec6c8e287450550daab6d89b

commit 51b921d0e33302b3f431dcfa15bd6588408525ea
Author: Yohei Yukawa <yukawa@google.com>
Date:   Wed Mar 5 14:53:01 2014 +0900

    DO NOT MERGE - Preserve the order of InputMethodManager method calls

    Cherrypick of I0f8d33b0c77129f72581bc43e7f4fdc25469b520

    This CL allows the Framework class InputMethodManager to behave
    in a more deterministic way, that is to say, with an I/O barrier.

    InputMethodManager#setAdditionalInputMethodSubtypes is internally
    implemented as a RPC to the corresponding counterpart in
    InputMethodManagerService. The problem here is that this RPC is
    marked as "oneway". As a consequence, this public API call
    returns immediately without waiting the additional subtypes are
    actually added. This behavior is also not documented so far
    unfortunately.

    See the following demo code:

      Final InputMethodManager imm = ...;
      imm.setAdditionalInputMethodSubtypes(id, subTypes);
      Final List<InputMethodInfo> ims = imm.getInputMethodList();

    Currently, it is not guaranteed that the InputMethodInfo returned
    from #getInputMethodList reflects the result of the previous call
    of #setAdditionalInputMethodSubtypes because of its undocumented
    asynchronous nature.

    With this CL, InputMethodManager#setAdditionalInputMethodSubtypes
    behaves as if it has I/O barrier. This change should make it easy
    for IME developers to use additional subtype mechanism.

    BUG: 13033954
    BUG: 13291370
    Change-Id: I0455b176bfb3176c533ba3241881f05092b98abc

commit 3b9de0a429910cd66e5360b279328778bb710083
Merge: 657dbc4 00e12e6
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 19:47:29 2014 -0700

    am 00e12e61: am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev

    * commit '00e12e61472d850c00cf1e479fda2b371ead1257':
      Show the keyguard if unsecure window on top

commit 00e12e61472d850c00cf1e479fda2b371ead1257
Merge: b377688 1066fc6
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 19:40:49 2014 -0700

    am 1066fc61: Resolved conflicts for merge of ad63d914 to jb-mr2-dev

    * commit '1066fc61a371443e9423f890f6f7615f2d1e4c6c':
      Show the keyguard if unsecure window on top

commit 3217cc6ff2b3139d8854a3f681da6ae1d163ac92
Merge: 381374b e066359
Author: Craig Mautner <cmautner@google.com>
Date:   Fri Mar 14 00:40:20 2014 +0000

    Merge "Fix activities appearing behind launcher icons" into klp-dev

commit 97121c923c5b093925a507cac159309d89a1a0c8
Author: Dave Platt <dplatt@google.com>
Date:   Thu Mar 13 17:27:03 2014 -0700

    Harden NsdManager against null-dereference crashes

    Due to race conditions or programming errors, the NsdManager
    can attempt to process an asynchronous status message (and issue
    a callback to the listener) after the listener has already been
    removed from the NsdManager state.  This causes dereferencing of
    null objects, and a crash.

    Split out the three async-queue message cases:  these are ones
    in which message.arg2 does not hold an NsdManager array index
    and the code should not interpret this field as if it were.

    Add an explicit check for "null listener" (the array index in the
    message has already been released), log a warning, and exit early.

    Safeguard accesses to the "NSD service type" string from a possibly
    null) NsdServiceInfo object... return a constant "?" string rather
    than crashing.

    Bug: 9016259

    Manual cherrypick of commit b1fbb14122a99c62363a949dd634294f5e887ef,
    change-ID I7a6ff6842cf035cefbafe2a023ae1fd43734081e in master.

    Change-Id: I8d9b7a1763d47d061a0f46b3cb453de4bdb8c2ed

commit 381374b3cd66f364fd644c21f2d9128bcde2f58a
Merge: 7baa7c8 fbd5521
Author: Mike Lockwood <lockwood@google.com>
Date:   Thu Mar 13 23:32:17 2014 +0000

    Merge "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents" into klp-dev

commit e0663591a563483d06de14ead3eebfe194fb2d10
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 16:16:20 2014 -0700

    Fix activities appearing behind launcher icons

    cherry picked from d5c91ece7bfea74ee7ab2bc86f3cb3f5c531f866

    Change-Id: I76d20398e71c1be4accfaed6b0791674197b4fb0

commit 7e435a011dd519f76a8ec1a8ed99a22bee5c3e26
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Mar 13 14:18:59 2014 -0700

    Verify certificates

    b/13418320

    Change-Id: I39c81b1557a16c7a4666a4531a398efa91dcb00c

commit 7baa7c804501b9cbcb5de281c5ddfaf03ba08f7a
Merge: 8e240af 3f7f322
Author: JP Abgrall <jpa@google.com>
Date:   Thu Mar 13 20:33:43 2014 +0000

    Merge "ConnectivityService: add support to set TCP initial rwnd" into klp-dev

commit 1066fc61a371443e9423f890f6f7615f2d1e4c6c
Merge: 8b91693 ad63d91
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 12:35:23 2014 -0700

    Resolved conflicts for merge of ad63d914 to jb-mr2-dev

    Change-Id: Iea4cec4ce6f588c9f976ac5a1ff0208f1f91471b

commit 8e240af51df5d7b793f4ae54ce6ff4795ee9f6ac
Merge: 11b7d9f a1d7c74
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Thu Mar 13 18:09:57 2014 +0000

    Merge "Remove SO_BINDTODEVICE from VPN protect" into klp-dev

commit ad63d91439b3617a3d2ba9f1696ac7a27b5f9389
Merge: 2e582d1 20a4f49
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 11:01:13 2014 -0700

    am 20a4f490: am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top

    * commit '20a4f490957407b9534fc453833de2fe2f276426':
      Show the keyguard if unsecure window on top

commit 20a4f490957407b9534fc453833de2fe2f276426
Merge: 9bce403 817f558
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 10:58:11 2014 -0700

    am 817f5586: am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top

    * commit '817f5586053ae135a59cd0768980ca741e9215b0':
      Show the keyguard if unsecure window on top

commit 817f5586053ae135a59cd0768980ca741e9215b0
Merge: 08ee74b 3d958f8
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 10:55:31 2014 -0700

    am 3d958f81: am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top

    * commit '3d958f81c54252b452631ea1bb6e7954fc7066c8':
      Show the keyguard if unsecure window on top

commit 3d958f81c54252b452631ea1bb6e7954fc7066c8
Merge: ea5586e 468e8e9
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 10:51:39 2014 -0700

    am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top

    * commit '468e8e9873d764c090576d70aebf658e3e89bbfe':
      Show the keyguard if unsecure window on top

commit 468e8e9873d764c090576d70aebf658e3e89bbfe
Merge: 4be7c61 1f52437
Author: Craig Mautner <cmautner@google.com>
Date:   Thu Mar 13 10:47:49 2014 -0700

    am 1f52437d: Show the keyguard if unsecure window on top

    * commit '1f52437de9aa6089a72c7c992f9e7291a6a96115':
      Show the keyguard if unsecure window on top

commit 11b7d9fa6685e742f5b3e3235a8e6e4920dbed02
Merge: cd0d8cb b628dd8
Author: Svetoslav <svetoslavganov@google.com>
Date:   Thu Mar 13 17:26:44 2014 +0000

    Merge "PrintSpooler crash if printer is reported to have only one color mode." into klp-dev

commit cd0d8cb2d97ced5e8110a14f5cf4bc2d4fe68440
Merge: 4545b1d 91c9561
Author: Adrian Roos <roosa@google.com>
Date:   Thu Mar 13 17:22:58 2014 +0000

    Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev

commit 4545b1d29b23cbfe11aa7ca6b54f6518a38db278
Merge: a796168 af7dcaa
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Mar 13 16:22:52 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 91c9561cbe665f91e1665f30362c409ae180b127
Author: Adrian Roos <roosa@google.com>
Date:   Mon Mar 10 17:00:11 2014 +0100

    DO NOT MERGE - Fix keyguard pattern lockout bug

    (cherry picked from commit 7c11f8b4659c3444d5037b756b6e5f45a2ea61a6)
    Conflicts:
    	packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java

    Bug: 13302967
    Change-Id: Ifa4c01e630bd3aa8cadfea8dbbbb4686d50eb945

commit 3f7f3221dff1a4b2bac3a2dc3e39f732d44fdf2a
Author: JP Abgrall <jpa@google.com>
Date:   Fri Feb 21 12:05:20 2014 -0800

    ConnectivityService: add support to set TCP initial rwnd

    The value for the TCP initial receive window comes from,
    in order,

    kernel
      /proc/sys/net/ipv4/tcp_default_init_rwnd

    init.rc (via properties)
      net.tcp.default_init_rwnd

    properties
      net.tcp.default_init_rwnd

    gservices
      Settings.Global.TCP_DEFAULT_INIT_RWND

    Bug: 12020135
    Change-Id: I0e271be19472900fa9f3bab037d53383ec014a9e

commit a796168da0ea139fe7312678f5031cd96c50097c
Merge: 73bd57f 3026d0b
Author: Dianne Hackborn <hackbod@google.com>
Date:   Thu Mar 13 01:12:13 2014 +0000

    Merge "Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4" into klp-dev

commit 6f29b30dc28a66b8e1fb71884c777d995cab56aa
Author: Jim Miller <jaggies@google.com>
Date:   Wed Feb 26 17:28:13 2014 -0800

    Attempt to fix a bug where SIM progress dialog gets stuck.

    The fix makes sure onPause() is called when KeyguardHostView
    is removed.

    Bug 10323372

    Change-Id: I20dd1f68c270adbd4582f2cd8ed9b03964b4477c

commit 73bd57f7abdb9eaf9239aa13945990acc6c97cd2
Merge: 60d7c99 f86c3a4
Author: Jeff Brown <jeffbrown@google.com>
Date:   Thu Mar 13 00:12:52 2014 +0000

    Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-dev

commit 60d7c9957891280dfb131d5d58f32cf6fb82d5a2
Merge: 15258ac 7fb580e
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Wed Mar 12 23:22:37 2014 +0000

    Merge "DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager" into klp-dev

commit 7fb580ea4ddbf3d406610485fd7e5fbf25cdef21
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Fri Jan 10 16:44:39 2014 -0800

    DO NOT MERGE setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager

    setAvrcpAbsoluteVolume is passed wrong unit parameter from AudioManager.
    It cause maximize volume in Bluetooth speaker/device.
    The volume expected by Bluetooth Avrcp should be from 0 to 15.
    But the current volume parameter passed to Bluetooth Avrcp is from 0 to 150.
    It is scaled by 10 times than the correct volume.
    index = rescaleIndex(index * 10, streamType, streamTypeAlias);
    Should divide the volume by 10 before pass to Bluetooth Avrcp.

    bug:12495379
    Change-Id: I4160588e92ee384e21a75d63036d8bd6ccb30621

commit 1f52437de9aa6089a72c7c992f9e7291a6a96115
Author: Craig Mautner <cmautner@google.com>
Date:   Mon Mar 3 13:26:03 2014 -0800

    Show the keyguard if unsecure window on top

    When traversing windows save the fact that windows above the topmost
    fullscreen window do not hide the lockscreen. If there is such a
    window don't show it.

    (cherry picked from commit ab55e524b89c13082193940a5bf8480a2c2522d9)

    Fixes bug 13225149.

    Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236

commit b628dd825b319704f8a8135addef766ec892ce84
Author: Svetoslav <svetoslavganov@google.com>
Date:   Thu Jan 2 11:23:44 2014 -0800

    PrintSpooler crash if printer is reported to have only one color mode.

    bug:11993304

    Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c
    (cherry picked from commit b0d97b87ba5f23ee867f381a4e5916ebb2e5f762)

commit 3026d0bf0a4d89788cdc29573dcecb2bd72b263c
Author: Dianne Hackborn <hackbod@google.com>
Date:   Wed Mar 12 11:10:08 2014 -0700

    Fix issue #11965706: Calls using IntentChooser are now Broken in 4.3 and 4.4

    The activity manager needs to set launchedFromPackage to be that of
    the previous package in the case where flow has been redirected
    through an intermediate activity.

    Change-Id: I678fc2e7d984991ac715251a784ba7d7ccbf9fca

commit af7dcaadec635740f3fd9e6a4ba7729582199b14
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Mar 12 09:09:05 2014 -0700

    Import translations. DO NOT MERGE

    Change-Id: I2b0385f74777c70bda7e2962777c1c96767bd222
    Auto-generated-cl: translation import

commit 15258ac86bb397206ac44c073baf184ffa0e62f2
Author: Jeff Brown <jeffbrown@google.com>
Date:   Tue Mar 11 23:02:35 2014 -0700

    Fix power manager display wake lock bugs.  (DO NOT MERGE)

    Under certain circumstances, the power manager might continue to
    hold the display wakelock long after the display had been turned
    off due to the mDisplayReady flag having an incorrect value.

    1. An inverted conditional caused DisplayPowerState to incorrectly
    signal the screen on ready state.

    2. The DisplayPowerController failed to clear the block screen on
    flag in the case where the screen was turned off before it became
    unblocked from turning on.  This could happen when the display was
    rapidly turned on-off-on-off.

    Bug: 13248135
    Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d

commit f86c3a44f2af2dedd3c1d3a3c630a51f83984605
Author: Jeff Brown <jeffbrown@google.com>
Date:   Mon Mar 10 21:24:37 2014 -0700

    Retain display when creating specialized contexts. (DO NOT MERGE)

    Fixed a bug that cause Context.createPackageContext() to discard
    display information.  Likewise also fixes issues where the
    activity token, override configuration, user handle, and
    restriction state might be discarded.

    As part of this change, reworked how Contexts are created to make
    initialization easier to understand and less error-prone.
    The init() methods have been removed and most of the state is
    now stored in final variables.

    Bug: 12015587
    Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11

commit 7f2c9e9420252a493b7399639f794c8a963444e5
Merge: 52af2ca 15b13a7
Author: Adam Powell <adamp@google.com>
Date:   Tue Mar 11 23:19:37 2014 +0000

    Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev

commit 15b13a792c0fd1f7349347f096de86b85cfc2f1f
Author: Adam Powell <adamp@google.com>
Date:   Wed Dec 4 11:15:29 2013 -0800

    Add a config override for ViewConfiguration#hasPermanentMenuKey

    Allow device overlays to override the behavior of the
    hasPermanentMenuKey method at build time. This is useful for devices
    that do not behave as the usual autodetection mechanism expects.

    Device overlays should set config_overrideHasPermanentMenuKey to 1 if
    the device DOES have a permanent menu key or 2 if the device DOES NOT
    have a permanent menu key.

    Bug 11698700

    Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c

commit 52af2ca919c068f1c9389fa4c979d2fe3105af40
Author: Narayan Kamath <narayan@google.com>
Date:   Mon Dec 16 18:18:12 2013 +0000

    DO NOT MERGE - Remove data dirs if a new install fails dexopt.

    We'd otherwise leave the data dirs & native libraries
    lying around. This will leave the app permanently broken
    because the next install of the app will fail with
    INSTALL_FAILED_UID_CHANGED.

    Also remove an unnecessary instance variable.

    Cherry-pick from master
    Bug 13416059

    Change-Id: I1e644aab74d5ea519231800915b39c2f55d043ae

commit 68c0346b22d11a0e2c5e89f1a9206bc06ad3d0cf
Author: Naofumi Harada <naofumi.harada@sonymobile.com>
Date:   Tue Jan 21 10:29:36 2014 +0900

    DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted

    Since Kitkat, an app pre-loaded under /system/priv-app/ has
    FLAG_PRIVILEGED. However, if the app updated and the device
    rebooted, privileged flag is unset from pkgFlags. This patch
    fix issue to assign privileged flag when scanning the updated
    packages.

    Bug: 12640283

    Cherrypick from master.

    Change-Id: I833d94cd911693c9291e8204f63bd8de945dbba6

commit a1d7c7444990f4eabf712db8cceb6d3ab1508dde
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Tue Feb 11 14:18:56 2014 -0800

    Remove SO_BINDTODEVICE from VPN protect

    SO_BINDTODEVICE is not needed with policy routing.
    SO_BINDTODEVICE was also used on the default iface which causes problems
    when the default iface is IPv6 only and the socket tries to connect to a
    IPv4 address.

    Bug: 12940882
    Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730

commit 674f85af4c04970ec8875669b3f08eaf0465ba4b
Merge: decfd70 fb5800e
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Tue Mar 11 17:51:50 2014 +0000

    Merge "Only allow System apps to make VPN exempt routes" into klp-dev

commit decfd7079b622f9135aeb8f7b2ec48005c844c38
Merge: e9821bf 18dd015
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Tue Mar 11 17:51:45 2014 +0000

    Merge "Add the calling package name to requestRouteToHost" into klp-dev

commit e9821bf2380bfa325e6398a6390a4083007d3006
Merge: 7138395 4bda437
Author: Christopher Tate <ctate@google.com>
Date:   Tue Mar 11 17:34:15 2014 +0000

    Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev

commit 7138395b26fcad9664ad05b9c98109f60db8a557
Merge: 6e6dc23 fafc1ce
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Mar 11 17:33:28 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 6e6dc23c692b14f5e70ee1453eab726978e4984e
Merge: e910a7c bca20aa
Author: Alan Viverette <alanv@google.com>
Date:   Tue Mar 11 02:12:13 2014 +0000

    Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev

commit e910a7ce8b42580b8bc184dfc340859a65e98c80
Merge: 6a5b7c6f df262cd
Author: Alan Viverette <alanv@google.com>
Date:   Tue Mar 11 02:12:05 2014 +0000

    Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev

commit 6a5b7c6ffbef87c6591dbc8f5813f61b3086bfad
Merge: 3a153c0 e8d2846
Author: Alan Viverette <alanv@google.com>
Date:   Tue Mar 11 02:11:58 2014 +0000

    Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev

commit 3a153c0de271a004710e5ac545c48778f7e51b12
Merge: cf8573c 190909f
Author: Adam Powell <adamp@google.com>
Date:   Tue Mar 11 01:22:10 2014 +0000

    Merge "Fix a bug in submenu presenter priority handling" into klp-dev

commit 4bda43777c72259cb5f1fb923a99584fb53a88ce
Author: Christopher Tate <ctate@google.com>
Date:   Mon Mar 3 12:03:09 2014 -0800

    DO NOT MERGE - Don't hang installs if the transport disappears

    Bug 12991308

    Cherry-pick from master.

    Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c

commit fbd5521fb5e94fad066e21b9f91f4782afe71660
Author: Mike Lockwood <lockwood@google.com>
Date:   Mon Mar 10 15:58:11 2014 -0700

    UsbDeviceManager: Fix race condition between accessory start and USB configured uevents

    Bug: 13393825
    Change-Id: Ice0ce47b4bd65e453771d44b17352982335e9ebd

commit cf8573c15456c4581b691c7380722ea6dccf11c5
Author: Jason Sams <jsams@google.com>
Date:   Mon Mar 10 13:32:42 2014 -0700

    Fix destruction issues relating to AllocationAdapter.

    bug 13170046

    Change-Id: I2a2ba3cbd7d08c659ed8958fbcc01919e36e86b0

commit 5757bf89c44e7a4805340b5634bec13a1caf39f8
Author: Jason Sams <jsams@google.com>
Date:   Mon Mar 10 13:32:21 2014 -0700

    Add hidden minor version ID for support lib workarounds.

    bug 13170046

    Change-Id: I0c77901752e9a0b10bd5be62311c79a0ab7128e5

commit ff7256e757502279b1777127a12eba235be679ae
Author: Jason Sams <jsams@google.com>
Date:   Mon Mar 10 13:31:51 2014 -0700

    Fix destruction issues relating to AllocationAdapter.

    bug 13170046

    Change-Id: I922b19c086b675949c6fae66c6dcb4c8af3b715f

commit 6d9ed0c35327adfba50004fe9270ee6471459fb0
Merge: 82ec144 fcbced3
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Mon Mar 10 20:04:09 2014 +0000

    Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev

commit fafc1ce9f896a3c57db22936764249978f8315d9
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Mar 10 12:36:47 2014 -0700

    Import translations. DO NOT MERGE

    Change-Id: Iee9ef4f534076df84a28d70663293dc42b26cb99
    Auto-generated-cl: translation import

commit 82ec1442487d66935cb0c30f6da3545d8c33af6e
Merge: 5243a76 7434fa3
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Mon Mar 10 18:46:56 2014 +0000

    Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

commit 7434fa31d8dbd881d44022829ea2b0a0c76728ce
Author: Zhihai Xu <zhihaixu@google.com>
Date:   Tue Jan 7 19:36:01 2014 +0000

    DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""

    This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

    bug:12099469
    Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e

commit 5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7
Merge: 1327e59 31727f8
Author: Vinit Deshapnde <vinitd@google.com>
Date:   Mon Mar 10 17:51:18 2014 +0000

    Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev

commit 190909f2c1b47a0ac9e50a2012cc8eae34391fa7
Author: Adam Powell <adamp@google.com>
Date:   Tue Dec 3 18:58:29 2013 -0800

    Fix a bug in submenu presenter priority handling

    Now that overflow menus and the PhoneWindow-level ListMenuPresenter
    can coexist, make sure that ListMenuPresenter handles submenus spawned
    by itself. Introduce an internal API for menus to prefer a specific
    presenter when performing item actions.

    Bug 11979407

    Change-Id: Id0b8fcbb8b310cbb3a63a1e5ea7a89de5d53f86f

commit 1327e59f36ceea5a1ee7dc66b311206345353de5
Merge: f175b19 ee0b3e9
Author: Wei Wang <weiwa@google.com>
Date:   Sat Mar 8 02:01:01 2014 +0000

    Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev

commit fcbced38a6a53c5fa31568417170afcf14d86ae6
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Fri Mar 7 16:51:41 2014 -0800

    DO NOT MERGE Debounce wifi country code Info

    We're getting signals from the radio and it sometimes drops out for
    a while.  This change will delay applying an empty country code
    for 15sec but apply non-empty country codes immediately.  It uses a
    sequence number so we only apply the most recent change, even if
    it's delayed.

    Also secures the wifi call to set the country code as we can't
    allow apps to set it willy-nilly.

    bug:11062898
    Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a

commit bca20aaf0e216b2628a889ea93a10ce3197f65e0
Author: Alan Viverette <alanv@google.com>
Date:   Fri Mar 7 16:50:24 2014 -0800

    DO NOT MERGE Quick fix for updating the FastScroller long list property

    BUG: 12553181
    Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79

commit f175b19aaac7ffe5553013d996a073693cac929d
Merge: 57a45f2 c9e5f54
Author: Adam Powell <adamp@google.com>
Date:   Fri Mar 7 23:28:19 2014 +0000

    Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev

commit df262cd922a7f337c50bec441d1d12161f701587
Author: Alan Viverette <alanv@google.com>
Date:   Fri Mar 7 14:30:11 2014 -0800

    DO NOT MERGE Check item type before re-binding transient state views

    BUG: 12701797
    Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20

commit 57a45f22ea7b0509fb918fa39e797a6061f75438
Merge: 93df07a 0bb1719
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Mar 7 22:49:33 2014 +0000

    Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev

commit 93df07a1b72488b64354098cd00dff1d36b76b12
Merge: 9823a17 2c82c08
Author: Craig Mautner <cmautner@google.com>
Date:   Fri Mar 7 22:30:25 2014 +0000

    Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev

commit 0bb17193cc764ea6c122a6a763cba7ece78ef8e7
Author: Elliott Hughes <enh@google.com>
Date:   Wed Nov 13 15:10:40 2013 -0800

    Fix a JNI local reference leak in JNIMediaPlayerListener::notify.

    Bug: https://code.google.com/p/android/issues/detail?id=62137
    b/12603577
    Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247

commit e8d2846fb9bc5f353a3a4af2678932895b7a242f
Author: Alan Viverette <alanv@google.com>
Date:   Fri Mar 7 14:08:02 2014 -0800

    DO NOT MERGE Ensure transient state views are temporarily detached

    BUG: 12024471
    Change-Id: I02659d65d664b3fd8991a0527bd23801db6f1a9d

commit 9823a170e4f9ff1d9233eb7eb661c4d418c2e2a7
Merge: dbeb0c1 aefa427
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Mar 7 20:23:29 2014 +0000

    Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev

commit dbeb0c12950e92a59671f8da7952ddf3486789b4
Merge: ef86ff5 5d37e0d
Author: Vineeta Srivastava <vsrivastava@google.com>
Date:   Fri Mar 7 20:09:00 2014 +0000

    Merge "telephony: Add same named operator configuration for some operators" into klp-dev

commit 5d37e0d1b48a94fcf95e73c2ab931c00a5713eb0
Author: Sungmin Choi <sungmin.choi@lge.com>
Date:   Fri Dec 13 14:50:40 2013 +0900

    telephony: Add same named operator configuration for some operators

    Add same named operator configuration for 404, 405, and 520.
    That is, show roaming icon though same named operators.

    Bug: 12121959
    Change-Id: I9148bab727170f670fd2679db69b123b0526bb32

commit ef86ff58178e876f1dfbedd65166cc806f006ba8
Merge: bc57651 22ec0dc
Author: Vineeta Srivastava <vsrivastava@google.com>
Date:   Fri Mar 7 18:37:42 2014 +0000

    Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev

commit 22ec0dc35360c8a9406656fa32213ab153b587ef
Author: Sungmin Choi <sungmin.choi@lge.com>
Date:   Mon Dec 16 16:14:44 2013 +0900

    Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]

    This reverts commit 119e24f98706cb0a1217b41e7e750b94c1a8941a.

    Bug: 12163013
    Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c

commit aefa427c27396bef64ee37d5c4d94e0a63cf7b05
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Jan 10 10:39:27 2014 -0800

    Make MtpDatabase use libexif instead of libjhead

    b/12203995

    Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501

commit bc57651fb510d7b1a2811235f96e711b6be12a12
Merge: 785d764 278250d
Author: Leon Scroggins III <scroggo@google.com>
Date:   Fri Mar 7 18:13:29 2014 +0000

    Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

commit 785d764bd56b2d41216aa52ab8f6b6af9179f9c9
Merge: faddd77 cb15c7a
Author: Dianne Hackborn <hackbod@google.com>
Date:   Fri Mar 7 18:12:30 2014 +0000

    Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev

commit faddd77a917dd423aee5fc64c056c8c2e0ce6f9a
Merge: 70d5ed2 092759f
Author: Andy McFadden <fadden@android.com>
Date:   Fri Mar 7 17:40:39 2014 +0000

    Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev

commit 2c82c08a5422de757491eec9c3a2347bb4fb4dd0
Author: Craig Mautner <cmautner@google.com>
Date:   Mon Mar 3 13:26:03 2014 -0800

    Show the keyguard if unsecure window on top. DO NOT MERGE.

    When traversing windows save the fact that windows above the topmost
    fullscreen window do not hide the lockscreen. If there is such a
    window don't show it.

    Fixes bug 13225149.

    Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236

commit 278250dafb5ebb0f9b66c46b32e7dd1251cdb6ff
Author: Leon Scroggins III <scroggo@google.com>
Date:   Tue Jan 14 15:14:57 2014 -0500

    DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
    BUG:13191516

    Original CLs below:

    In nativeDecodeFileDescriptor, use fdopen.

    Instead of attempting to mmap the entire file, create an
    SkFILEStream from a FILE.

    BUG:11669944
    BUG:11028218
    Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

    -------------------------------------------------------------------------

    Decode file descriptor from the correct offset.

    Fix a few bugs in nativeDecodeFileDescriptor:
    1. Restore the FD's offset when exiting the function.
    2. Copy the data when potentially using an SkImageRef.
       The old behavior would have continued to modify the
       file descriptor's offset each time a new decode was
       required. The copy ensures that the file descriptor
       remains unchanged.
    3. Buffer the file stream.
       Prior to this change, if the image was not a PNG,
       the stream would be rewound to the beginning of the
       file, even if the file descriptor was passed in with
       an offset. Thanks to the buffer, the stream is only
       rewound to the original offset.

    Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
    in external/skia

    BUG:12807677
    BUG:12895876
    Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b

commit 70d5ed269268c1da6169b49b555d7295ac5d6763
Merge: 98a6bcf be63a95
Author: Chris Wren <cwren@android.com>
Date:   Fri Mar 7 15:08:29 2014 +0000

    Merge "use relative positioning for notification actions" into klp-dev

commit c9e5f540a954a878365e88e42f78800d4eafa188
Author: Adam Powell <adamp@google.com>
Date:   Fri Jan 10 10:16:27 2014 -0800

    Fix a bug where OnTouchListeners in action views could be removed

    ActionMenuPresenter should only replace the touch listener when binding
    a generated item view.

    Bug 12470259

    Change-Id: I8c4c6110065605225a20cb7ed872255282085661

commit cb15c7a83b62a37e5def14413e37925391e5ea39
Author: Dianne Hackborn <hackbod@google.com>
Date:   Thu Mar 6 17:39:11 2014 -0800

    More on issue #12031685 (DO NOT MERGE)

    Integrate from master:

    Fix issue #13065185: Frequent runtime restarts on launching...

    ..."Hill Climb Racing" app

    A service is in use when it is in the restarting state.

    Change-Id: Iffdea96f867f89089e7ad07b4b1bef056951a5e8

commit 98a6bcf433fc23c343343b04c57c5a68d0177ac7
Merge: 430652c 9f97ac4
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Mar 7 01:16:49 2014 +0000

    Merge "ExifInterface: fix class load failure" into klp-dev

commit 430652c1e18c54dc6ae9debedb6394f2f1905903
Merge: 8cb232c 52f610d
Author: Dianne Hackborn <hackbod@google.com>
Date:   Fri Mar 7 01:04:50 2014 +0000

    Merge "Fix issue #13199860: PRE_BOOT_COMPLETED intent is..." into klp-dev

commit 9f97ac433aa9157173912b8714f260626326043e
Author: Zhijun He <zhijunhe@google.com>
Date:   Fri Dec 20 13:28:00 2013 -0800

    ExifInterface: fix class load failure

    libexif_jni was renamed as libjhead_jni

    b/12203995
    Change-Id: I0ceff1ad288c7ce2255826d5d5ba9ca1f121a556

commit 8cb232cb796718ad91e56672a2c8fdbf88633001
Merge: e29c96e 6a1846a
Author: Svetoslav <svetoslavganov@google.com>
Date:   Fri Mar 7 00:37:14 2014 +0000

    Merge "ProgressBar is important for accessibility by default." into klp-dev

commit e29c96e7ae96f3b94937ea86ffcc0d4d1e930248
Merge: a3ea4be c0786cc
Author: Marco Nelissen <marcone@google.com>
Date:   Fri Mar 7 00:34:36 2014 +0000

    Merge "libexif is now libjhead" into klp-dev

commit c0786cc258363c246d65a7172e6faf6dae9ef2d5
Author: Marco Nelissen <marcone@google.com>
Date:   Thu Dec 19 14:21:19 2013 -0800

    libexif is now libjhead

    b/12203995
    Change-Id: I6b749e251a2e03738550ce911e59527f80d26212

commit a3ea4be5425fc2a561290c08a9f5f31f374afc31
Author: Jay Shrauner <shrauner@google.com>
Date:   Fri Feb 7 13:28:59 2014 -0800

    Prevent SpellChecker from setting invalid range - DO NOT MERGE

    Add check for invalid range before setting for further check
    at end of parse() loop.

    Bug:12936072
    Change-Id: Ie0b33b8e69fe47e5d3371640be5681f13a4e4f6e
    (cherry picked from commit ea4adf28474d949c51518a5abe6dbd3a3529cf29)

commit 092759f6b438dc599b71a5d0557718cf4f5a2427
Author: Takahiro Aizawa <takahiro.aizawa@sonymobile.com>
Date:   Wed Dec 11 19:22:26 2013 +0900

    EGL14.eglCreateWindowSurface should set producerControlledByApp

    Interface of Surface class changed.
    To reflect the change for EGL14, add producerControlledByApp flag.
    Similar change can be seen in 0fa257fe53bf520bdde93996a1901ce6bc3e1788

    Bug 13226025
    (cherry-pick from AOSP Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0)

    Change-Id: I853484c38f065d71b365bb48b2a794ca4787e70a

commit 92a3283286df3a6c2a27ecde8eddf23abbb87de9
Author: Leon Scroggins III <scroggo@google.com>
Date:   Wed Jan 15 14:23:14 2014 -0500

    DO NOT MERGE - Fix Javadoc build break.

    Remove links to non-specific function name.

    Bug: 13246311

    Change-Id: I5643074149d0a511bd760d638751c44e3ec4c557
    (cherry picked from commit 2bc49ca96eb786f66dc2b9573e1f09bdb2d82d5e)

commit be63a95d2b4c1fba31c71db7dc1d2248418e1ded
Author: Chris Wren <cwren@android.com>
Date:   Tue Dec 3 14:31:01 2013 -0500

    use relative positioning for notification actions

    Bug: 10531101
    Change-Id: Ia1d7cac880f620a9760271344edf920caf0d852d

commit ee008d4264a95bba5f90b17856fc06fa29a6f12c
Merge: 617e715 5e49b49
Author: Leon Scroggins III <scroggo@google.com>
Date:   Thu Mar 6 19:37:28 2014 +0000

    Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev

commit 6a1846a084fd09b3ade3fa80a49c29dcbe7cd60d
Author: Svetoslav <svetoslavganov@google.com>
Date:   Mon Jan 13 15:25:58 2014 -0800

    ProgressBar is important for accessibility by default.

    If a view does not have callbacks, or content description, or does not draw
    content, and it is marked as important for accessibility auto, then the system
    decides it is not important and does not report it. Apparently progress bar
    draws content that means something and it should be important for accessibility
    by default.

    Change-Id: Icd3837fb8b9e208c98b90707f3b195622d71949e
    (cherry picked from commit 7face75f2c655a371a4dcdf6063886f92c637ce4)

commit 617e715a40e2867c0b30d1bae38c20815ee30071
Merge: 71ab245 4b0f155
Author: Eric Laurent <elaurent@google.com>
Date:   Thu Mar 6 19:21:26 2014 +0000

    Merge "Fix RemoteController synchronization mode" into klp-dev

commit 52f610d248e53444fe27ed695ed9d412567c90f1
Author: Dianne Hackborn <hackbod@google.com>
Date:   Thu Mar 6 10:52:05 2014 -0800

    Fix issue #13199860: PRE_BOOT_COMPLETED intent is...

    ...broadcasted repeatedly at every boot time

    Remember the last done pre-boot receivers, so that if we have
    a new pre boot receiver appearing (without the platform version
    changing), when we re-write the file of done receivers it will
    contain all of them, not just the new one.

    Change-Id: I4ed3478edc549d4b023ec4b3719111bc4d970ae4

commit ee0b3e9f824a85eebbabe307310d844a15956ae8
Author: Wei Wang <weiwa@google.com>
Date:   Tue Oct 29 21:05:37 2013 -0700

    DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.

    Add bluetooth adv data, APIs in BluetoothAdpater etc.

    Cherry picking ble advertising changes from master to KLP MR2.
    b/13137996

    Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4

    Conflicts:
    	core/java/android/bluetooth/BluetoothAdapter.java
    	core/java/android/bluetooth/BluetoothGatt.java

    Conflicts:
    	core/java/android/bluetooth/BluetoothAdapter.java

commit 71ab245a0d7830791cb89ec9130313620a1ee029
Merge: 4c8c27e 76c59a8
Author: Dianne Hackborn <hackbod@google.com>
Date:   Thu Mar 6 18:29:19 2014 +0000

    Merge "Fix issue #11536426 DO NOT MERGE" into klp-dev

commit 76c59a89e96b1c4dea8303a6e35ceef2b0f5ac22
Author: Dianne Hackborn <hackbod@google.com>
Date:   Mon Dec 2 10:04:42 2013 -0800

    Fix issue #11536426 DO NOT MERGE

    Permission denied when trying to launch an activity from a notification

    We don't remove pending intents when updating an app, which is necessary
    to keep app widgets and other things working.  However, when uninstalling
    an app, we should clear out all of its pending intents.

    Change-Id: I95067b31098115b5a7b127766fd093750063bbb8

commit 4c8c27ed7360abe3cd91a281e40d4e21948abc2a
Author: Santos Cordon <santoscordon@google.com>
Date:   Mon Mar 3 16:06:54 2014 -0800

    Updating wording around PROCESS_INCOMING_CALL. DO NOT MERGE.

    bug: 12175514

    Change-Id: I37dba7eedbf86c0b87ce559a52fe0b15c6911bfa
    (cherry picked from commit b4aeac730503eb4b9db7d2dcece48e1ca13b4b30)

commit 4b0f1554577e1782e93998af5d83ebf5add3543e
Author: Jean-Michel Trivi <jmtrivi@google.com>
Date:   Thu Jan 2 15:08:26 2014 -0800

    Fix RemoteController synchronization mode

    Fix erroneous argument check in RemoteController syncrhonization
      mode setter..

    Bug 12189375

    Change-Id: Ic2b70ec48cacc6d10f17762387b52b4e4304aa10

commit 5e49b497ae2019586937aae0e8159292363728b5
Author: Leon Scroggins III <scroggo@google.com>
Date:   Tue Dec 3 16:26:51 2013 -0500

    Update framework to use M33 Skia. DO NOT MERGE

    (These CLs are already in master.)

    Bug: 13246311

    This cherry-picks 7 CLs:

    -----------------------------------------------------------------------

    Remove calls to deprecated SkBitmap::setIsOpaque()

    setIsOpaque() has been removed from ToT Skia.

    Update setters for mIsPremultiplied and hasAlpha to take the
    other into consideration.

    cherry-pick from: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a

    -----------------------------------------------------------------------

    Merge AssetStream with AssetStreamAdaptor.

    Add enums to the constructor for AssetStreamAdaptor to choose the
    different behaviors used by the (former) two different classes.

    The old clients of AssetStream now get the following features of
    AssetStreamAdaptor
    - Debugging statements on error.
    - The stream is an SkStreamRewindable.
    - getLength() returns the correct value, and the old way of getting
      the length (read(NULL, 0)) is no longer implemented, since it is
      no longer used.
    - isAtEnd() returns the correct value. ToT Skia makes it pure virtual,
      so some implementation is necessary.

    cherry-pick from: I2a5395914e4f53830aaefee396556459083a1c56

    -----------------------------------------------------------------------

    Deprecate Android-specific SkPaint functions.

    The following functions were problematic:
     const SkGlyph& getUnicharMetrics(SkUnichar, const SkMatrix*);
     const SkGlyph& getGlyphMetrics(uint16_t, const SkMatrix*);
     const void* findImage(const SkGlyph&, const SkMatrix*);

    Replacing them with calls through SkGlyphCache solved a nasty crash
    bug, so they have all been deprecated.

    Bug: 11968757
    cherry-pick from: Id746315d41aec5b211b78b172a883c2061130f08

    -----------------------------------------------------------------------

    pass SkGlyphCache into updateGlyphCache()

    Doing so prevents us from double-locking the glyph cache, thereby
    effectively locking ourselves out of reusing work that we'd just done.

    Bug: 11968757
    cherry-pick from: I5c552f2d0bbe30af2ce9054ba684e7da756a0d89

    -----------------------------------------------------------------------

    Updates to the Skia API needed to merge the WebView m33 version of Skia.

    cherry-pick from: I0f63b53f2aae58871413b132742fc84138f069a3

    Bugfix for screenshots (recent apps) due to incorrect rowBytes computation

    bug: 12915192
    cherry-pick from: I4d5fe2a2f75baf66099e0970fb646686a1992714

    -----------------------------------------------------------------------

    Fix bug in AndroidPixelRef where we did not store the correct imageInfo for a recycled bitmap.

    cherry-pick from: I882483b78886e2f19fa4e43a86e69f5a82b3b7e5

    -----------------------------------------------------------------------

    Change-Id: Ie2b731a9f0795802418cfecddb4b684c92c64d33

commit 221849b6d68704340754200492329f19cef7979b
Merge: 77a60f0 8c0dff6
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Mar 6 17:00:46 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 77a60f006f8b7260207043529d3ed004db301bd5
Merge: c5dea68 f55616c
Author: Santos Cordon <santoscordon@google.com>
Date:   Thu Mar 6 01:54:20 2014 +0000

    Merge "Update permission description string." into klp-dev

commit 31727f84569cadf4623427a45c4b8284640fdcc0
Author: Vinit Deshapnde <vinitd@google.com>
Date:   Wed Mar 5 17:14:49 2014 -0800

    DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi

    This change fixes two problems - first, if you rebooted phone after
    turning on Airplane mode, Wifi controller goes to ScanOnly mode which
    may end up in Wifi radio transmissions. Secondly, because of this
    incorrect state, the state machine doesn't turn on Wifi once Airplane
    mode is turned off.

    bug: 11409692
    Change-Id: I55b4a5352a72a9c783e1b9891dd5363434585fb0

commit c5dea68e9856698953dafca868eaee7207614641
Merge: 1ff2df6 bdffc3a
Author: Michael Wright <michaelwr@google.com>
Date:   Thu Mar 6 00:50:15 2014 +0000

    Merge "Revert Japanese special case fallback keys." into klp-dev

commit 1ff2df6194148f487ccb014a7c5302fa8ffe2571
Merge: 2b58a29 25d9ce4
Author: Fabrice Di Meglio <fdimeglio@google.com>
Date:   Thu Mar 6 00:29:34 2014 +0000

    Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev

commit 2b58a29f825e6442d8767a36adaf1770b86d5725
Merge: 40a2600 b3670c5
Author: Fabrice Di Meglio <fdimeglio@google.com>
Date:   Thu Mar 6 00:29:20 2014 +0000

    Merge "Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE" into klp-dev

commit f55616cd8b78ed55148ee2dcfcf59cd34cdb4a96
Author: Dirk Dougherty <ddougherty@google.com>
Date:   Mon Mar 3 14:05:21 2014 -0800

    Update permission description string.

    Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
    (cherry picked from commit 08d7c2861fee205a314c3847ab5f5894617a233b)

commit fb5800ed9ccefc1110800e91632dda930fc66151
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Fri Feb 14 13:24:29 2014 -0800

    Only allow System apps to make VPN exempt routes

    requestRouteToHost will only allow system applications to make routes
    exempt from the VPN's routing rules.

    If a VPN is currently running and a non-system app requests a route it
    will only succeed if that host is currently covered by a VPN exempt
    routing rule. Otherwise it will fail.

    For example, if a VPN is running and the MMS network is brought online
    those routes will be added as VPN exempt. If an application then tries
    to request a route to a MMS endpoint it will succeed because the routes
    already exist. If an application tries to request a route to a host
    covered by the VPN the call will fail.

    Bug: 12937545
    Change-Id: If7bcec91bbb96c62c8fb69748c975847e6c00b6f

commit 18dd015e6edfb5f46e364f89f84e43d356d58c4a
Author: Chad Brubaker <cbrubaker@google.com>
Date:   Fri Feb 14 13:22:34 2014 -0800

    Add the calling package name to requestRouteToHost

    The calling package name will be used to check if an application is a
    system application when deciding if a route should be exempt from VPN
    routing rules.

    Bug: 12937545
    Change-Id: I2c09c875fe9bb9685871a0a801ddcbb32fc17405

commit 40a26004810623f02546a31cb0ce49a0502bdff7
Author: Dianne Hackborn <hackbod@google.com>
Date:   Fri Jan 17 13:29:21 2014 -0800

    Issue #13308712: Add --checkin to package manager dump.

    Change-Id: I50a559ea4bded47a792e1b5b319a5bbed41b4233

commit 25d9ce40584e8544098842154a0b84e626244840
Author: Fabrice Di Meglio <fdimeglio@google.com>
Date:   Mon Dec 9 16:40:14 2013 -0800

    Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE

    - fix the NPE by checking the validity of the child reference retrieved by View.getChildAt(...)

    Change-Id: I61b9233345a4f1110aa06ea563a81dcdf6b35783

commit b3670c54e60387fde633fb91c649c5b896f8b962
Author: Fabrice Di Meglio <fdimeglio@google.com>
Date:   Mon Jan 6 16:30:43 2014 -0800

    Fix bug #12422326 Unable to change text direction programmatically using setTextDirection Android SDK API - DO NOT MERGE

    - force TextView internal layout recreation when its TextDirection is changed

    Change-Id: I7d6b088a9235362e03cb6694392df71bbf5a323a
    (cherry picked from commit 22228fec05129af9684f95d7a13aeff92144bd90)

commit 2d1e8c49582fb91df0a05a778c228fc1cd89e026
Merge: 1d13f13 30a2bc8
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Wed Mar 5 18:23:56 2014 +0000

    Merge "Only apply tcp buffer sizes for default net" into klp-dev

commit 8c0dff620a40443d218551cc2e26b1d4b3480aa3
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Mar 5 09:58:27 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: I04b3a1aaa779644d884edf77fd94dc8dccd1e36b
    Auto-generated-cl: translation import

commit 1d13f13deac644bddbae8a1f92642074a32d7a6c
Merge: 1e995c7 28c8cfd
Author: Christopher Tate <ctate@google.com>
Date:   Wed Mar 5 00:51:32 2014 +0000

    Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev

commit 1e995c76485f8a7477177886890b834c31e8d1a6
Merge: fee6f69 88c9083
Author: Christopher Tate <ctate@google.com>
Date:   Wed Mar 5 00:51:04 2014 +0000

    Merge "Update PackageMonitor to recognize new 'replacing' semantics" into klp-dev

commit fee6f69e8321c3f94c2b341fe483f7b1f6534169
Merge: 8ec59a7 ca4d040
Author: John Spurlock <jspurlock@google.com>
Date:   Tue Mar 4 19:09:20 2014 +0000

    Merge "Volume panel should not clear system ui flags." into klp-dev

commit 8ec59a72889f7da0c13119977ca62ada8a1498e0
Merge: d36ede3 a3e41e7
Author: John Spurlock <jspurlock@google.com>
Date:   Tue Mar 4 19:08:46 2014 +0000

    Merge "Show hideycling for non-primary users." into klp-dev

commit d36ede391619e6fc8a1553f5b2f4b33b3603cd65
Merge: be65918 88a9ce4
Author: John Spurlock <jspurlock@google.com>
Date:   Tue Mar 4 19:08:31 2014 +0000

    Merge "Allow lights-out + bar icon dimming on low-end devices." into klp-dev

commit be6591856bd62e14d7c87dd927db0cbbed242d81
Author: Guang Zhu <guangzhu@google.com>
Date:   Wed Feb 19 17:58:38 2014 -0800

    use min app launch time in AppLaunch perf test

    Change-Id: Id3a5872ff29fba5daeff058f0842fd011e50a0a1
    (cherry picked from commit 2861a89bed9066e206917c41357a5e589e8482cb)

commit 30a2bc87d42d13bdab3a334845e83dc5b9d05cb0
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Fri Feb 28 16:44:00 2014 -0800

    Only apply tcp buffer sizes for default net

    This may mean that secondary networks have bad network settings,
    but currently default settings are overriden by secondary nets
    which seems worse.

    bug:13211589
    Change-Id: I08d56e618208781bf6b21a88663c2b8503a4f226

commit ca4d040342a70d42d6dd6f15361931c054275804
Author: John Spurlock <jspurlock@google.com>
Date:   Wed Dec 4 13:47:36 2013 -0500

    Volume panel should not clear system ui flags.

    Remove private WM flag (used only by the volume panel) to force
    the clearable system UI flags clear.

    Instead, always lay out the volume panel as if the bars are visible,
    as we do for system dialogs - and don't clear the flags.

    Reverts part of I25f29af5b6518aba695b64a75977ae240b742118

    Bug:11986621
    Change-Id: I842729d729d2a6eb2a687d0b930ddb160c6a1b57

commit a3e41e708868320b02342f29bc77e01ffff8d5cc
Author: John Spurlock <jspurlock@google.com>
Date:   Mon Dec 9 11:59:45 2013 -0500

    Show hideycling for non-primary users.

    User 0 owns the window (system_server) but should be allowed
    to display on a user's behalf.

    Use the corresponding private flag for this system window, since
    we cannot classify it by type (TYPE_TOAST) in policy.

    Bug:12015090
    Change-Id: I33aedb4624288415a5e1ae937676b693024546a9

commit 88a9ce42096d6bb324c169633db709ff171972fc
Author: John Spurlock <jspurlock@google.com>
Date:   Tue Jan 14 14:51:23 2014 -0500

    Allow lights-out + bar icon dimming on low-end devices.

    Maintain fallback to OPAQUE mode on low-end devices in place of the
    translucent modes.

    Bug: 12546110
    Change-Id: Ia3582c305cb09aadd56c6aa58b039a174675c79a

commit 81479358decb0a2cefbb8245e0f56ed0e966d697
Author: Yorke Lee <yorkelee@google.com>
Date:   Tue Dec 10 09:51:40 2013 -0800

    Reword the "Quick contacts not available" string

    Bug: 12077052
    Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
    (cherry picked from commit 89b366fa95f625275f1b94d800d22998f942ab8c)

commit 28c8cfd7624902bbd72cb021fe000e0a8c818aab
Author: Christopher Tate <ctate@google.com>
Date:   Mon Jan 13 13:48:22 2014 -0800

    Adapt to underlying changes in the PBKDF2 implementation

    We need to specify "PBKDF2WithHmacSHA1And8bit" now in order to get precisely
    the same output as was previously generated with "PBKDF2WithHmacSHA1".  We
    also now try both when it's ambiguous which was used to generate the archive
    checksums.

    Bug 12494407

    Cherry-pick from master.

    Change-Id: I2d6081dd62f50f7d493045150b327ed120de7abd

commit 88c908323a53bc217f860f811038725f668df454
Author: Christopher Tate <ctate@google.com>
Date:   Wed Jan 8 16:54:25 2014 -0800

    Update PackageMonitor to recognize new 'replacing' semantics

    The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
    EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
    on a forward-locked application.  Update PackageMonitor to recognize this
    new information and express it appropriately to the observer.

    Bug 11988313

    Cherry-pick from master.

    Change-Id: Iecea1876ffc918f23f9fa5845f1f89ed8d740dd5

commit 4ef0aabe93877b7f30645b873fbc003651151f2f
Merge: efe1b24 535c9e7
Author: Jay Shrauner <shrauner@google.com>
Date:   Mon Mar 3 21:56:17 2014 +0000

    Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev

commit efe1b2402abd6f26f6483533b68983475f6e6144
Author: Jonathan Dixon <joth@google.com>
Date:   Wed Oct 9 17:28:13 2013 -0700

    DO NOT MERGE: Fix build after checkThread fix merge to master

    Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
    method did not exist in klp-dev branch.

    Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
    (cherry picked from commit b212b9f2ba709273b3d46a1ef3b091eb2292c917)

    Cherry pick to klp-dev as part of Bug: 13246014

commit 4e1bf7320222b481ed483dd78e5dd5d22d4eb644
Merge: 8ebfbff f4e2723
Author: Bart Sears <bsears@google.com>
Date:   Mon Mar 3 18:42:27 2014 +0000

    Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev

commit f4e272324424ad90a48c548644904b147466863c
Author: Primiano Tucci <primiano@google.com>
Date:   Thu Sep 5 12:01:51 2013 +0100

    DO NOT MERGE: Adding freeMemoryForTests static method to WebView.

    This is going to be used by pagecycler tests.
    See: b/10629847

    Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
    (cherry pick of 244267500254daff8745f8c0fae3edcac735873f)

    Cherry pick to klp-dev as part of Bug: 13246014

    Conflicts:
    	core/java/android/webkit/WebViewClassic.java
    	core/java/android/webkit/WebViewFactoryProvider.java
    (cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

    Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6

commit 8ebfbffcbb86123a54dd7979b26525eec30d77b9
Merge: 7ab82a0 0c9bd3e
Author: rich cannings <richc@google.com>
Date:   Mon Mar 3 17:19:00 2014 +0000

    Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev

commit 535c9e74d3d6f336b4775194bfaac984ddd99934
Author: Yorke Lee <yorkelee@google.com>
Date:   Fri Dec 6 16:35:29 2013 -0800

    Catch ActivityNotFoundException in quick contacts badge

    Bug: 12015287
    Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
    (cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)

commit 7ab82a0c602956251be9dd5539208af9cfecea33
Merge: 9395f63 657dbc4
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 22:21:05 2014 +0000

    am 657dbc40: am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '657dbc40427c17cbf31be1a17cf2fa7a4116722a':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 9395f63aa5a386088ad93e3e226ef333084c5b74
Merge: 43ec3b9 55cab00
Author: Carlos Valdivia <carlosvaldivia@google.com>
Date:   Thu Feb 27 22:21:01 2014 +0000

    am 55cab009: (-s ours) am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '55cab009f0c9b1939f8336e26144850a5fdc9d3a':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 657dbc40427c17cbf31be1a17cf2fa7a4116722a
Merge: 55cab00 b377688
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 12:04:07 2014 -0800

    am b3776881: am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit 'b37768816cd9c530dcbb3a8f51d87536406a975b':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit b37768816cd9c530dcbb3a8f51d87536406a975b
Merge: 9272db0 8b91693
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 12:00:08 2014 -0800

    am 8b916936: am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '8b91693683895a8b148f6ffea8944cef2ba8d99b':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 8b91693683895a8b148f6ffea8944cef2ba8d99b
Merge: c45bd7f 2e582d1
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:55:10 2014 -0800

    am 2e582d13: am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '2e582d1379fa78e2693269d76d2bcd763bfbfba1':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 2e582d1379fa78e2693269d76d2bcd763bfbfba1
Merge: 4013c4b 9bce403
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:44:37 2014 -0800

    am 9bce4032: am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '9bce4032e9b3ea3433f7c75cbfb8d784b12392aa':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 9bce4032e9b3ea3433f7c75cbfb8d784b12392aa
Merge: 42d7a0b 08ee74b
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:40:21 2014 -0800

    am 08ee74b1: am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '08ee74b1f1c4df28faa4168114853836cc471095':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 08ee74b1f1c4df28faa4168114853836cc471095
Merge: a7d13fa ea5586e
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:38:01 2014 -0800

    am ea5586ef: am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit 'ea5586ef7fc29463f8144931c2c43261d15043b1':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit ea5586ef7fc29463f8144931c2c43261d15043b1
Merge: 45aaa37 4be7c61
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:28:43 2014 -0800

    am 4be7c61a: am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '4be7c61a339f8200527f6df5a7b2215c96f81b4b':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 4be7c61a339f8200527f6df5a7b2215c96f81b4b
Merge: a1b8931 5677513
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:24:05 2014 -0800

    am 5677513b: am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '5677513b7c46ca08a7fa34b9d227d7a448db6757':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 55cab009f0c9b1939f8336e26144850a5fdc9d3a
Merge: 1f9ebc5 9272db0
Author: Carlos Valdivia <carlosvaldivia@google.com>
Date:   Thu Feb 27 11:22:53 2014 -0800

    am 9272db02: am c45bd7f2: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit '9272db024d013fbb48ec476c77562ab31d75a461':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 5677513b7c46ca08a7fa34b9d227d7a448db6757
Merge: a87bdc1 da37ed8
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:20:24 2014 -0800

    am da37ed8b: am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit 'da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit 9272db024d013fbb48ec476c77562ab31d75a461
Merge: 868d4c3 c45bd7f
Author: Carlos Valdivia <carlosvaldivia@google.com>
Date:   Thu Feb 27 11:17:11 2014 -0800

    am c45bd7f2: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit 'c45bd7f20987ed2fd29b9192edb38d02b4caa23b':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit da37ed8b0aebdf885a32cbe28e8fd5a2240d38c3
Merge: bc39746 b9ba0c6
Author: Paul Lawrence <paullawrence@google.com>
Date:   Thu Feb 27 11:16:49 2014 -0800

    am b9ba0c6c: Prevent authenticators from using Settings to  launch arbitrary activities.

    * commit 'b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542':
      Prevent authenticators from using Settings to  launch arbitrary activities.

commit b9ba0c6c43f0f7f0d5e347030e3c86a86ed74542
Author: Paul Lawrence <paullawrence@google.com>
Date:   Wed Feb 26 15:42:34 2014 -0800

    Prevent authenticators from using Settings to  launch arbitrary activities.

    Various authenticator results such as getAuthToken and addAccount might
    result in an Intent returned to the AccountManager caller. A malicious
    authenticator could exploit the fact that the Settings are a system app,
    lead the user to launch add account for their account type and thus get
    Settings to use the intent to start some arbitrary third parties Activity.

    The fix is to make sure that the UID of the app associated with Activity
    to be launched by the supplied intent and the Authenticators UID share
    the same signature.  This means that an authenticator implementer can only
    exploit apps they control.

    This is a backport of 5bab9daf3cf66f4de19f8757e386030e8bef23ce

    Bug: 7699048
    Change-Id: Ifed345c2fc20020d55fa2cab1f2f7ea509ea09b2

commit c45bd7f20987ed2fd29b9192edb38d02b4caa23b
Author: Carlos Valdivia <carlosvaldivia@google.com>
Date:   Sun Sep 29 05:11:56 2013 -0700

    Prevent authenticators from using Settings to  launch arbitrary activities.

    Various authenticator results such as getAuthToken and addAccount might
    result in an Intent returned to the AccountManager caller. A malicious
    authenticator could exploit the fact that the Settings are a system app,
    lead the user to launch add account for their account type and thus get
    Settings to use the intent to start some arbitrary third parties Activity.

    The fix is to make sure that the UID of the app associated with Activity
    to be launched by the supplied intent and the Authenticators UID share
    the same signature.  This means that an authenticator implementer can only
    exploit apps they control.

    Bug: 7699048
    Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
    (cherry picked from commit 5bab9daf3cf66f4de19f8757e386030e8bef23ce)

commit bdffc3ad05180d716cc4b808b292e2262f0cd461
Author: Michael Wright <michaelwr@google.com>
Date:   Wed Feb 26 15:40:44 2014 -0800

    Revert Japanese special case fallback keys.

    Reverts commits 4567e40eb04589d211af82f2dcb16cb3955c605e and
    a977707d6e7006d11cfde045f187e777b31b9e04, which added special case fallbacks
    for game controllers in the Japanese locale.

    Bug: 12923922
    Change-Id: I229126e589e11fb5de86772ef9c59d09723af941

commit 43ec3b939b732ea2d3b26635c51a6c91f2692270
Merge: 5daec5b 1f9ebc5
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Tue Feb 25 18:14:26 2014 +0000

    am 1f9ebc5f: (-s ours) am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs

    * commit '1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
      DO NOT MERGE Sanitize WifiConfigs

commit 1f9ebc5fa73e7d324429a697cd10abb3761b1ff0
Merge: 26c6c15 868d4c3
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Tue Feb 25 10:12:35 2014 -0800

    am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs

    * commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
      DO NOT MERGE Sanitize WifiConfigs

commit 868d4c341034de6e2ebb6c1a247488b00d17c78d
Merge: b3c96c4 9502306
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Tue Feb 25 10:09:13 2014 -0800

    am 95023066: DO NOT MERGE Sanitize WifiConfigs

    * commit '950230663fb3a9af438ec2ee57605fc9e7a58428':
      DO NOT MERGE Sanitize WifiConfigs

commit 5daec5b58a89779b0f8775f52859bae0bda17b23
Merge: 28009e8 c62f918
Author: Mike Lockwood <lockwood@google.com>
Date:   Tue Feb 25 15:35:33 2014 +0000

    Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev

commit 950230663fb3a9af438ec2ee57605fc9e7a58428
Author: Robert Greenwalt <rgreenwalt@google.com>
Date:   Fri Feb 7 03:52:12 2014 -0800

    DO NOT MERGE Sanitize WifiConfigs

    Do this both on input from apps (giving error) and between wifi and
    ConnectivityService (ignoring bad data).  This means removing all
    addresses beyond the first and all routes but the first default and
    the implied direct-connect routes.

    We do this because the user can't monitor the others (no UI), their
    support wasn't intended, they allow redirection of all traffic
    without user knowledge and they allow circumvention of legacy VPNs.

    This should not move forward from JB as it breaks IPv6 and K has
    a more resilient VPN.

    Bug:12663469
    Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2

    Conflicts:
    	core/java/android/net/LinkProperties.java
    	services/java/com/android/server/WifiService.java
    	wifi/java/android/net/wifi/WifiStateMachine.java

commit 0c9bd3ed4da14fbfe7f9cab872b94ed2be436cc2
Author: rich cannings <richc@google.com>
Date:   Wed Feb 12 13:24:25 2014 -0800

    Make FORCE_STOP_PACKAGES "signature|system"

    Bug: 12992556
    Change-Id: Iebc91aabb67034e8a5ada7efdcdaaed4cc6d0f1b
    (cherry picked from commit 4b7510cf842fdadf1b7e8e0495ded1b2bbd50d7e)

commit 28009e8102aa91294362cc2d7770cab73d02e640
Merge: c2803d4 dab7a9e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Feb 20 18:31:02 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit c2803d473ad180fa70e5000f0607795c92c4035d
Merge: 554b43a 6fb89ba
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Feb 20 18:30:49 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 554b43a066b6a084dbb9b7dba014de4b12ba1175
Merge: aa20b27 b3425a6
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Feb 20 17:59:40 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit aa20b27472552ebc812dfbb3cbe260115ee43db1
Merge: e9adafd 8807558
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Feb 20 17:55:32 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit e9adafd1b95a7934bb813cb168e33a85a762a504
Merge: 46a0224 69046bb
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Feb 20 17:55:23 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 46a02249d7bde3fb88cc5312f88dab6d1690e20e
Merge: 3e63704 da799ef
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Feb 20 17:55:13 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 3e6370425ea3ac4e5d89ce042512913062212ccc
Merge: 01825b7 13aea18
Author: Xavier Ducrohet <xav@google.com>
Date:   Thu Feb 20 17:41:07 2014 +0000

    Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev

commit 6fb89ba641da4d29e739525e9b6efccdf1693211
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Feb 19 22:16:02 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: I9accaa37043e730ad6ec4aa98901a48e0858b132
    Auto-generated-cl: translation import

commit dab7a9ed704e500601194375f3bd8ff3e3cf9a55
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Feb 19 22:08:21 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: I0c823200179a75e0444f6e86ecc6813a6e662fa0
    Auto-generated-cl: translation import

commit b3425a65aa05c1f1eb17dce9bb709c1cd3a76aab
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Feb 19 19:42:43 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: If9205c555286daf7dea68702d2da39752b59def4
    Auto-generated-cl: translation import

commit da799ef3a092bdeeb6ffc4442674eeb1a1cc1d18
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Feb 19 18:54:52 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: I31e5b7b7aa453a0455fd31eca6a11520730a26a7
    Auto-generated-cl: translation import

commit 69046bb06cb7760e69b016efa771568e986fec75
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Feb 19 18:49:33 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: I3003f43c32943496e855ba2744a7492232dbd56b
    Auto-generated-cl: translation import

commit 8807558c32983de08834192689ac2f3a9fa64bf2
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Feb 19 18:45:30 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: I3300523019b91cffd6f36d02434c521ab7368f37
    Auto-generated-cl: translation import

commit 01825b7aa3c864426c78c08c2f6004a8362c2b47
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Wed Feb 19 10:53:27 2014 -0800

    Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]

    For these font families, text was always rendered as italic. This
    changeset fixes the issue.

    Bug: http://b.android.com/57221
    Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
    (cherry picked from commit e327212adde1136807bbdf052e8cc3861f8a6aba)

commit 13aea18b34e527cffeaa6cb81f5ecb7c4a66cb11
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Wed Feb 19 11:05:02 2014 -0800

    Set default text style in layoutlib as NORMAL [DO NOT MERGE]

    If a style doesn't specify text style (normal/bold/italic/bold-italic)
    then default to normal instead of throwing an error.

    Bug: http://b.android.com/61358
    Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
    (cherry picked from commit 0acfb16dcd95468fe032204f54618e86becfd1eb)

commit c62f918e0eabd5c036ba43172d36f587157feed6
Author: Mike Lockwood <lockwood@google.com>
Date:   Wed Feb 19 11:18:02 2014 -0800

    UsbDeviceManager: Fix race condition entering USB accessory mode

    When switching USB modes there are often spurious connect and disconnect events
    that occur before reenumeration is complete.  There is currently a 1000ms timer
    to "debounce" the disconnect events. But with some USB accessories, this timeout
    is not long enough, which results in an endless cycle of attempts to enter
    USB accessory mode when the phone is connected.

    To fix this, we now wait up to 10 seconds for the host to successfully configure
    the device when entering USB accessory mode before giving up.
    This is separate from the existing debounce timer, so the behavior of the
    USB state change broadcasts are not affected.

    Bug: 12877769
    Change-Id: I7aa61f8a618546d749a7ddfc97bf103029a73d03

commit 45dbfcc781a3926d22571b6ccfa3f27ec896f119
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Tue Jan 7 11:58:44 2014 -0800

    Improve text rendering and measurement.

    1. Fix a bug where baseline of the run was modified while rendering
    resulting in crooked text in some cases.

    2. Use GlyphVector.getLogicalBounds() for text measurement which is more
    accurate than getVisualBounds().

    3. This change also optimizes text rendering by not computing the advances
    for individual glyphs when not needed.

    Change-Id: I66792c4d8f50eaf29afa70bccca1e6c812a3fa28

commit 3bf38b4165877274067a385cfe6472639a203a58
Merge: 0db6e6a eb3c545
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Thu Feb 6 02:06:02 2014 +0000

    Merge "Add methods for Time_Delegate" into klp-dev

commit 0db6e6a567e25d560586863c7be654a0c1da5795
Merge: a955314 35d56c0
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Thu Feb 6 02:05:42 2014 +0000

    Merge "Optimize layout rendering in layoutlib" into klp-dev

commit a955314d905f8567c852226ce4f74994826e8777
Merge: fd8cba3 58037a4
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Thu Feb 6 02:05:21 2014 +0000

    Merge "Add missing files to fix libphonenumber for layoutlib." into klp-dev

commit fd8cba3ab83972eefc796fa122b0ec9222078b1c
Merge: 8a89227 5ad7c18
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Thu Feb 6 02:04:49 2014 +0000

    Merge "Fix the measurement of text bounds." into klp-dev

commit 8a892279bd1b212311f4200f306a317985463918
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Wed Feb 5 17:11:14 2014 -0800

    Fix a bug in Nine Patch library.

    The nine patches were not drawn correctly if they were not positioned at
    the top left corner of the canvas.

    Bug: http://b.android.com/29959
    Change-Id: Icfed522ea07322a3ee9f3955067d3da26c4b0b5b

commit eb3c5459eb893061779b102236a81069efdbef73
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Fri Jan 31 19:03:48 2014 -0800

    Add methods for Time_Delegate

    Bug: http://b.android.com/65359
    Change-Id: I7c2d09286d6bcd9899444aaa5a4a5a342e39d923

commit 35d56c0d67537e56fafebd8edf790026644fe8de
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Mon Jan 20 17:02:37 2014 -0800

    Optimize layout rendering in layoutlib

    The height of a layout should be zero if it is assigned a layout_weight.
    This way, the layout is measured only once and prevents spurious errors.

    Bug: https://code.google.com/p/android/issues/detail?id=58398
    Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a

commit 58037a4404e639d28695a0f1c17053b53b96b970
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Thu Jan 16 14:16:23 2014 -0800

    Add missing files to fix libphonenumber for layoutlib.

    Change-Id: I8102da6c1c4625e887293a8823770d199521c53f

commit c174288d345d4a80b326b12ff4c10a6c99570997
Author: Dianne Hackborn <hackbod@google.com>
Date:   Mon Dec 9 11:26:11 2013 -0800

    Fix issue #12031685: Sticky Service Breakage in Android 4.4.1

    Got a little too aggressive about cleaning up service state; need to
    avoid removing services from an app until we are in the second loop
    doing the final cleanup, otherwise we can leave services around with
    restarting their process.

    Also fix crash:

    W/BinderNative(  667): Uncaught exception from death notification
    W/BinderNative(  667): java.lang.ArrayIndexOutOfBoundsException: length=0; index=0
    W/BinderNative(  667): 	at android.util.ArraySet.valueAt(ArraySet.java:301)
    W/BinderNative(  667): 	at com.android.server.am.ActiveServices.killServicesLocked(ActiveServices.java:2069)
    W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService.cleanUpApplicationRecordLocked(ActivityManagerService.java:12412)
    W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService.handleAppDiedLocked(ActivityManagerService.java:3596)
    W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService.appDiedLocked(ActivityManagerService.java:3744)
    W/BinderNative(  667): 	at com.android.server.am.ActivityManagerService$AppDeathRecipient.binderDied(ActivityManagerService.java:1024)
    W/BinderNative(  667): 	at android.os.BinderProxy.sendDeathNotice(Binder.java:493)
    W/BinderNative(  667): 	at dalvik.system.NativeStart.run(Native Method)

commit 301b1facb23d148efebd7a2aa5c174cd7c04cc6f
Merge: af2f2f7 26c6c15
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:56:27 2014 -0800

    am 26c6c15f: am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit '26c6c15f54231c154bb2f7febb053d034cbe40c5':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 26c6c15f54231c154bb2f7febb053d034cbe40c5
Merge: 9ecadd7 b3c96c4
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:53:27 2014 -0800

    am b3c96c4c: am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit 'b3c96c4c57cb97924f828ea917b1c4d63b2c9d00':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit b3c96c4c57cb97924f828ea917b1c4d63b2c9d00
Merge: 6f34b93 1d15160
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:50:18 2014 -0800

    am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit '1d151607fbee65fc9fc2bb1cb38a850c1f68bede':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 1d151607fbee65fc9fc2bb1cb38a850c1f68bede
Merge: 3238d0d 4013c4b
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:46:35 2014 -0800

    am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit '4013c4b18ccc66b510f4cdb222d4c04597975843':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 4013c4b18ccc66b510f4cdb222d4c04597975843
Merge: ea47cb6 42d7a0b
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:43:47 2014 -0800

    am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit '42d7a0bff5da6aeb8323ae0c797e9c4e116b637b':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 42d7a0bff5da6aeb8323ae0c797e9c4e116b637b
Merge: bf6cecc a7d13fa
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:41:48 2014 -0800

    am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit 'a7d13fabd6184e411215e9a841cf16097f1a5127':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit a7d13fabd6184e411215e9a841cf16097f1a5127
Merge: 5716e4b 45aaa37
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:40:04 2014 -0800

    am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit '45aaa377c5d090003c6cf5fb54fff856a0807c4f':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 45aaa377c5d090003c6cf5fb54fff856a0807c4f
Merge: 776b395 a1b8931
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:36:49 2014 -0800

    am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit 'a1b89310d58df14570f7f6f5abb677c976c63a7a':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit a1b89310d58df14570f7f6f5abb677c976c63a7a
Merge: 7f4d829 a87bdc1
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 13 12:33:39 2014 -0800

    am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

    * commit 'a87bdc1f8ff308f90ec7a3234c4848c79d4c3988':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit af2f2f767a1673f10a2b44f913832cacefda341b
Merge: 4503409 9ecadd7
Author: Daniel Cashman <dcashman@google.com>
Date:   Mon Jan 13 10:56:41 2014 -0800

    am 9ecadd7c: am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

    * commit '9ecadd7cedc492faef163a314713caddbd5da39a':
      Clear cached locations when location providers disabled Bug: 12118307

commit 9ecadd7cedc492faef163a314713caddbd5da39a
Merge: c454bbe 6f34b93
Author: Daniel Cashman <dcashman@google.com>
Date:   Mon Jan 13 10:53:31 2014 -0800

    am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

    * commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
      Clear cached locations when location providers disabled Bug: 12118307

commit 6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8
Merge: b15429a 3238d0d
Author: Daniel Cashman <dcashman@google.com>
Date:   Mon Jan 13 10:50:03 2014 -0800

    am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

    * commit '3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
      Clear cached locations when location providers disabled Bug: 12118307

commit 3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d
Merge: 503c5a3 766b5c4
Author: Daniel Cashman <dcashman@google.com>
Date:   Mon Jan 13 18:44:45 2014 +0000

    Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

commit 4503409a477f3fca2eb60e4105d804069d7b0cad
Merge: a4bd593 75c55f9
Author: Daniel Cashman <dcashman@google.com>
Date:   Mon Jan 13 18:44:37 2014 +0000

    Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

commit a4bd5931554ccf8e93b1c773a8f3cb4f15fdd23c
Merge: 76e5ca8 c454bbe
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:27:26 2014 -0800

    am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit 'c454bbe805bd6ed096ec6b4b811c4e4b67a86225':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit c454bbe805bd6ed096ec6b4b811c4e4b67a86225
Merge: 5d515f2 b15429a
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:24:05 2014 -0800

    am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit 'b15429a6853472207c2a4aefd22dd009e851edb7':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit b15429a6853472207c2a4aefd22dd009e851edb7
Merge: fd70624 503c5a3
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:18:58 2014 -0800

    am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit '503c5a32a4e718282b88f73e602c09e1bda49aec':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit a87bdc1f8ff308f90ec7a3234c4848c79d4c3988
Merge: 6826387 bc39746
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:17:01 2014 -0800

    Merge commit 'bc39746e' into manualmerge

commit 503c5a32a4e718282b88f73e602c09e1bda49aec
Merge: 562fddc ea47cb6
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:14:04 2014 -0800

    am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit 'ea47cb6763d36fcc916c63dd764b48b4b6f1ff01':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit ea47cb6763d36fcc916c63dd764b48b4b6f1ff01
Merge: 05e3f55 bf6cecc
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:10:12 2014 -0800

    am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit 'bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit bf6cecc21f50d1bc98e0d2dec41bef3ce259a23f
Merge: 1d8f592 5716e4b
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:05:35 2014 -0800

    am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 5716e4bfb980c8bab01b51944c1e715d76d59b1d
Merge: ef12b1d 776b395
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:02:48 2014 -0800

    am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit '776b3956a9742b868b037dffd2b24c17b2dfa0e6':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 776b3956a9742b868b037dffd2b24c17b2dfa0e6
Merge: ea19884 7f4d829
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 13:00:09 2014 -0800

    am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit '7f4d82932c812fbac1d99ceaf9462b7a763f5231':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 7f4d82932c812fbac1d99ceaf9462b7a763f5231
Merge: ef4694c 6826387
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 12:55:24 2014 -0800

    am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit '6826387e50f9f272d53ca1f725f573bbddcdf5c1':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit bc39746ee9c5962538a96b3edff10e52eb00fc40
Merge: 4325333 8e0c776
Author: David Christie <dnchrist@google.com>
Date:   Fri Jan 10 12:53:41 2014 -0800

    am 8e0c7768: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

    * commit '8e0c7768c87014fef277df84c737dd6c37fb8866':
      DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

commit 5ad7c183f39df43562c69aba21ea422ad69bdae0
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Tue Jan 7 11:58:44 2014 -0800

    Fix the measurement of text bounds.

    Bug: 12366230
    Change-Id: I203b678363dc7b688c744503ee10216baca658a9

commit 6826387e50f9f272d53ca1f725f573bbddcdf5c1
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 6 18:15:05 2014 -0800

    DO NOT MERGE: Clear cached locations when location providers disabled
    Bug: 12118307

    Change-Id: I8595b50d30c0f3ff2cc7dab14141a739cd6b9daa

commit 8e0c7768c87014fef277df84c737dd6c37fb8866
Author: David Christie <dnchrist@google.com>
Date:   Mon Jan 6 17:57:30 2014 -0800

    DO NOT MERGE: Clear cached locations when location providers disabled
    Bug: 12118307

    Change-Id: Iae668409be5c5bd715681624b2a54a4daa690932

commit 766b5c4342898054ad2036764d811057812cc562
Author: David Christie <dnchrist@google.com>
Date:   Wed Dec 18 14:33:57 2013 -0800

    Clear cached locations when location providers disabled
    Bug: 12118307

    (cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

    Change-Id: Ief869b9e38858092bfa3f8d6d090a278dee7d86c

commit 75c55f92f5ca00ced05b6778389454ae50beed61
Author: David Christie <dnchrist@google.com>
Date:   Wed Dec 18 14:33:57 2013 -0800

    Clear cached locations when location providers disabled
    Bug: 12118307

    (cherry picked from commit b084fef18ee1b5d24d15cff37dc3a053933d361e)

    Change-Id: I49eff73f89633052a2587112cdc381ae6d254bfe

commit 76e5ca81b3ba5a4f52126f2ec8907679b4356292
Author: Dave Platt <dplatt@google.com>
Date:   Fri Dec 6 14:03:47 2013 -0800

    Fix descriptor leak after accepting connections

    After accepting a connection on a listening socket and
    storing the resulting FileDescriptor into a newly created
    LocalSocketImpl, the new impl's "descriptor was created
    locally and should be closed normally" flag should be set.

    Bug: 11805817

    (cherry picked from commit 3e7305c6bf6062b5cb1e2ddcec6c6d30b4a8bc0d)

    Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1

commit 02f042ddd9ddf47ef88c4f174eb19a9bee296a45
Author: Dave Platt <dplatt@google.com>
Date:   Thu Dec 12 15:45:49 2013 -0800

    Fix socket descriptor leak from Zygote to child app

    Due to an API change in LocalSocket, Zygote must now
    manually close the FileDescriptor it created when it
    registered a LocalServerSocket.  The LocalSocket.close()
    routine will no longer do so.

    Bug: 12114500

    (cherry picked from commit 70ef29b04ee4ef7d7acfec79041dbe800961195e)

    Change-Id: Ief23a3c99e007dc4aa6f94dfb47a1b2b6c854dad

commit fd8be467a38eded82d17740824cf87daa38e25e0
Merge: 6e15a49 b852d28
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Jan 6 21:45:15 2014 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit b852d28cc1fb615d6347ac544266a6fc419ef005
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Jan 6 13:15:51 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: Ic05c1c30830a0c9d7cb62fd53f6b144650e05609
    Auto-generated-cl: translation import

commit 6e15a49eee1398aaf73f6b994b4148b198b67430
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Jan 6 12:16:37 2014 -0800

    Import translations. DO NOT MERGE

    Change-Id: Iad53d8fd9f6b72114c8ab0444d60e8fed54f1df9
    Auto-generated-cl: translation import

commit 2ae0419fb1ecd7e0705b7b87f8e73d6b73869bca
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Dec 30 09:30:42 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I749221e72ed6ab7c58b9b606e6818c884d6c1f34
    Auto-generated-cl: translation import

commit bbeb313567064b30ad93cdadd49beb8141c3d47b
Merge: 7bb3e3b 5a736a9
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 26 20:58:31 2013 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 5a736a99f8b9632a13b65e6c77f64b60ea560c66
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 26 11:09:48 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
    Auto-generated-cl: translation import

commit 7bb3e3b9ee22f2771c9fa71593c71910bbbcafac
Merge: ea22730 64ec792
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 26 19:09:18 2013 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 64ec7929485746ff958537187fedb410ee629008
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 26 11:07:34 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698
    Auto-generated-cl: translation import

commit ea227306d68c7097b9cb079b1bfa6157c1ec2d30
Merge: d6e863a 8677794
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 26 18:41:55 2013 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 8677794bfaea78533c862877264a723aa3cf6195
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 26 10:16:09 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
    Auto-generated-cl: translation import

commit d6e863a19a631fd0003f96d507a21863fe973caa
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 26 09:53:23 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be
    Auto-generated-cl: translation import

commit c5b19fd397f0c42fa64d79a50edec4e20394241f
Merge: 5039187 9868599
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 19 04:49:33 2013 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 986859998cf0311ea61c6ceb5a0d7c5fc1e9b18e
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Dec 18 16:36:21 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I3fa88a4097e6971c92bda10756ffd3699276bac3
    Auto-generated-cl: translation import

commit 50391871e61e491cf766fc83e261a8345d1cb5b6
Merge: db41eae 3cc579e
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Dec 19 00:14:26 2013 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 3cc579ebacb3c2b7fd212fde523903ca36f9d37c
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Dec 18 15:37:22 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I30e27dc30d542e9f2d3a23b3b1831cbd99e4b920
    Auto-generated-cl: translation import

commit db41eaef9036d069edd46d101cfa927e3a4cb694
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Dec 18 15:11:27 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Id35b27dea34c2fbad7dcfe2b30a34b26beb4e989
    Auto-generated-cl: translation import

commit 0a102150448747bcedcd3276740e1adb8130ae03
Merge: 60835d4 9ad3907
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Dec 11 21:32:53 2013 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 9ad3907169d4f05890e455fc8d9647af0c8d0ce0
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Dec 11 12:55:02 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I3065b51a4d5b72fc2dbd65f34f2b7dec89fb37d7
    Auto-generated-cl: translation import

commit 60835d4be46caff5d5b62ffb19031b580d42b504
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Dec 11 12:46:13 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Ifd2fd893861b827395080d8bfde873be9c0e7425
    Auto-generated-cl: translation import

commit 0bfbb676277c907444b09ba9e653491b32dddf9c
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Dec 9 09:53:12 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Iaac5bb8f0ee9e7471e6f6401eab46a86a406ce4c
    Auto-generated-cl: translation import

commit 6d25c934dcdf7a098d4e9f96cb206789dfd4afb7
Author: Geoff Mendal <mendal@google.com>
Date:   Wed Dec 4 11:35:25 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Ia2a23f77b1bb0b7fc9d731a185f3104d963cb44d
    Auto-generated-cl: translation import

commit 8d49b29d81be4d7ad694fa222c48c469bd112ca3
Author: Geoff Mendal <mendal@google.com>
Date:   Mon Dec 2 10:21:45 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Ifb196b0f76843e5488d4a387ed4f7add07e84ecd
    Auto-generated-cl: translation import

commit 99dcfed6e90a3639d7d9b8cc2c1654b7cc20d573
Author: Geoff Mendal <mendal@google.com>
Date:   Wed Nov 27 10:20:55 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: Icd558c400a77f1e2b72e7279e33c56aa96398a1e
    Auto-generated-cl: translation import

commit 1044a1dc197a9508ef8c6b352e7983ff234b8bc4
Merge: 7a4aded 2454125
Author: Xavier Ducrohet <xav@google.com>
Date:   Wed Nov 27 01:32:26 2013 +0000

    Merge "Update delegate methods in layoutlib." into klp-dev

commit 24541255c312ee34f9bf17eb5852cdffd4807065
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Mon Nov 25 19:59:54 2013 -0800

    Update delegate methods in layoutlib.

    Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63

commit 7a4adedf0aa9560578a7cd4b5db8b18ea2f46c4d
Author: Geoff Mendal <mendal@google.com>
Date:   Mon Nov 25 09:42:45 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I7261755eab5c935124863a747fbd09732c6c5288
    Auto-generated-cl: translation import

commit ce468a35b388ca46578934706b38dbae94941643
Author: Jeff Brown <jeffbrown@google.com>
Date:   Thu Nov 21 16:42:03 2013 -0800

    Stop wifi display discovery when no longer needed.

    Keep track of how many clients are requesting scans and scan
    continuously until all of them are gone then explicitly terminate the
    scan instead of letting it time out as before.

    Suspend wifi display scans while connecting or connected to a remote
    display.  This is handled by both the display manager and media router
    since neither has complete information about what is happening.
    Much of this code will no longer be needed once wifi display support
    is integrated directly into the media router service.

    Ensure that we don't attempt to scan or connect to wifi displays
    while the wifi display feature is off.

    Infer when a connection attempt fails and unselect the wifi display
    route automatically so it doesn't appear to be connecting forever.

    Fix issues around correctly canceling and retrying connection attempts.
    Often we would cancel but not retry.

    Improved connection reliability somewhat.  It seems that discovery must
    already be in progress in order for a connection attempt to succeed.

    Ensure QuickSettings uses exactly the same logic as the MediaRouteButton
    to determine when the remote display tile should be made visible.

    Bug: 11717053
    Change-Id: I18afc977b0e8c26204b8c96adaa79f05225f7b6e

commit 90e9b1d3dc15e97bb7ecb88289c3707fe03fb1a6
Author: Dianne Hackborn <hackbod@google.com>
Date:   Thu Nov 21 12:50:01 2013 -0800

    Fix issue #11790471: Crash removed home buttons and notification bar/shade

    Whoops persistent processes are, well, persistent.  Don't remove
    services from them.  We'll be keeping that process record around.

    Change-Id: I29e9fb6f704efdf0caad5e0307a7adbb416eed3b

commit c6db9c3b371ed8a90fa064f0487440d8a1d8bd46
Merge: 4d15966 8fc552e
Author: Svetoslav Ganov <svetoslavganov@google.com>
Date:   Thu Nov 21 20:12:12 2013 +0000

    Merge "Revert "PreferenceFragment showing the breadcrumb when not needed."" into klp-dev

commit 4d159661f453fa5d04698033f4bf6256f0d3c16a
Merge: 35f097a 68e7f13
Author: Svetoslav Ganov <svetoslavganov@google.com>
Date:   Thu Nov 21 20:12:02 2013 +0000

    Merge "Revert "PreferencesFragment showing the breadcrumb area in single pane mode."" into klp-dev

commit 8fc552e695701ff9bc64d5adca0f06a47f0f9f37
Author: Svetoslav Ganov <svetoslavganov@google.com>
Date:   Thu Nov 21 19:36:22 2013 +0000

    Revert "PreferenceFragment showing the breadcrumb when not needed."

    This reverts commit 7db97b0a29c613afb78c2734bf2504324a71963d.

    Change-Id: Iefe9807fd75baf04e61ec59b508e438320c80fe3

commit 68e7f13e2259d290d8e40839427f8d8de66eafd3
Author: Svetoslav Ganov <svetoslavganov@google.com>
Date:   Thu Nov 21 19:33:53 2013 +0000

    Revert "PreferencesFragment showing the breadcrumb area in single pane mode."

    This reverts commit 2b8795a9db2d494c38d34fd113a9153880a555c0.

    Change-Id: If8dcc7190cbe66af09945d8b23a3e1d8fd791b1d

commit 35f097a7bf4f30d0006221e9ae376ab85ab6937a
Author: Geoff Mendal <mendal@google.com>
Date:   Thu Nov 21 10:42:03 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I9cb0b85bb832e20fadbeb464485d0f0dc1e8b762
    Auto-generated-cl: translation import

commit b40ce4b8e85b44c8dc190bdfac0106402102280b
Author: Jeff Brown <jeffbrown@google.com>
Date:   Wed Nov 20 15:27:14 2013 -0800

    Make action bar media router icons blue again.

    This partially reverts commit e7ae644522f692c204d0233f91e77c7841bdfe53.

    Bug: 11790271
    Change-Id: Ib83dbede4472ba08bcf79bf9009d690278841723

commit bfdecccc48ef2fd9bfb19d77be2492f22971fed9
Merge: bc77af5 a68c87e
Author: Chong Zhang <chz@google.com>
Date:   Wed Nov 20 22:24:20 2013 +0000

    Merge "Only scan for wifi display when there is no active connections" into klp-dev

commit bc77af5b4c2161d7bc1e2de7dc472f343d7f9581
Merge: 853251e 9b38499
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Nov 20 21:08:31 2013 +0000

    Merge "Import translations. DO NOT MERGE" into klp-dev

commit 9b38499c565057f494eca22bbde53d4f51ef85ef
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Nov 20 09:50:34 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I499aa31a9f0e9a997d5e60eb778f16bc3b497663
    Auto-generated-cl: translation import

commit 853251e74f3e603f3431a3317b4d27ee042a4eb1
Author: Baligh Uddin <baligh@google.com>
Date:   Wed Nov 20 09:17:20 2013 -0800

    Import translations. DO NOT MERGE

    Change-Id: I0e8d6e841629716aecaea4bc1f326c1c2cba95c4
    Auto-generated-cl: translation import

commit a68c87eda84150b21f3d01511e60c720c6f6b695
Author: Chong Zhang <chz@google.com>
Date:   Tue Nov 19 19:13:22 2013 -0800

    Only scan for wifi display when there is no active connections

    Bug: 11717053
    Change-Id: I4ab73f6517fbfb8fcc131b89d0e934380dcf69e0

commit b0183f0ae311966cff0e10e8139c56f97288d1f2
Author: Christopher Tate <ctate@google.com>
Date:   Mon Nov 18 14:20:36 2013 -0800

    Harden against transiently unavailable backup transports

    The init & clear operations are particularly important to ensure
    delivery when at all possible, so we retry those periodically
    if the transport is unavailable when we first attempt them.

    Now with 100% less build break.

    Bug 11716868

    Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d

commit c04aa87e4ac41b6c65dceb7b20d7a7f92c2efec1
Merge: 096de3c 1a85d9f
Author: Dave Langemak <dlangemak@google.com>
Date:   Tue Nov 19 16:33:22 2013 +0000

    Merge "Fix incorrent page range parsing when custom print options used." into klp-dev

commit 096de3c3017bb9b9e5e1ed9ad790b7fedab95433
Merge: 6d0d4b5 4c5eb22
Author: Craig Mautner <cmautner@google.com>
Date:   Tue Nov 19 16:31:59 2013 +0000

    Merge "Notify apps when insets change." into klp-dev

commit 6d0d4b5b5a66ea348c2cdd89a89d4ab7f0483829
Merge: f7044fe e2515ac
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Tue Nov 19 08:08:12 2013 +0000

    Merge "Mask OOBE when filtering recent documents." into klp-dev

commit f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18
Merge: d6bbc54 d5965cb
Author: Sascha Prueter <saschap@google.com>
Date:   Tue Nov 19 07:23:34 2013 +0000

    Merge "Trying to unbreak build..." into klp-dev

commit d5965cb506bde84612109bf26c3fcc6712ca91e5
Author: Sascha Prueter <saschap@google.com>
Date:   Tue Nov 19 06:51:21 2013 +0000

    Trying to unbreak build...

    Revert "Harden against transiently unavailable backup transports"

    This reverts commit 8f98252afea3fd0e68693635ec21b6004a52fa69.

    Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a

commit d6bbc54423c0fb70e9e0415b3e8c12a435d715a1
Merge: 9d5a943 8f98252
Author: Christopher Tate <ctate@google.com>
Date:   Tue Nov 19 02:41:54 2013 +0000

    Merge "Harden against transiently unavailable backup transports" into klp-dev

commit e2515ac296d51e188b15790afd1e56b31d965ac8
Author: Jeff Sharkey <jsharkey@android.com>
Date:   Mon Nov 18 17:41:33 2013 -0800

    Mask OOBE when filtering recent documents.

    There is a data ownership issue related to recent documents Cursors,
    and the loader and UI threads can end up traversing the same Cursor
    at runtime.  This change masks OOBE crashes caused by this race until
    we have time to fix cleanly.

    Bug: 11736668
    Change-Id: I2039a5edcf341fcaedacc2f08bde96fc5a271782

commit 4c5eb224de2ace5fb60dbbaf9e92b77c07aaaa93
Author: Craig Mautner <cmautner@google.com>
Date:   Mon Nov 18 12:59:05 2013 -0800

    Notify apps when insets change.

    Activities that handle their own configuration get layout when hidden
    and the configuration changes but not when the content insets change
    if they are hidden. They need to get a fresh layout for both
    situations.

    Fixes bug 11544694.

    Change-Id: Iff3a9adb72ea7dfc3e5cd38e1b9cd7cf2006f8f5

commit 9d5a9434d3fe65d32aae0a400502dde8357f0ec7
Merge: 245408d 0baec41
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Tue Nov 19 00:19:01 2013 +0000

    Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

commit 8f98252afea3fd0e68693635ec21b6004a52fa69
Author: Christopher Tate <ctate@google.com>
Date:   Mon Nov 18 14:20:36 2013 -0800

    Harden against transiently unavailable backup transports

    The init & clear operations are particularly important to ensure
    delivery when at all possible, so we retry those periodically
    if the transport is unavailable when we first attempt them.

    Bug 11716868

    Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9

commit 0baec410c29206dc72d9f5afba5d45827e62c00c
Author: Deepanshu Gupta <deepanshu@google.com>
Date:   Wed Nov 13 19:09:17 2013 +0530

    Update ICU_Delegate methods. DO NOT MERGE

    Bug: 11435966
    Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a

commit 1a85d9fb243aae3750001094aa1514d4303cb3e0
Author: Svetoslav Ganov <svetoslavganov@google.com>
Date:   Fri Nov 15 21:42:12 2013 -0800

    Fix incorrent page range parsing when custom print options used.

    We have APIs for a print service to declare an activity with custom
    print options. In this activity the service can add custom properties
    as well as change the standard ones such as pages to print. The ranges
    of selected pages from the custom activity was incorrectly parsed
    resulting in an off by one error in what is shown to the user and as a
    result getting an exception when trying to print.

    bug:11719051

    Change-Id: Id04c94608178895f1d47381a63133f0eba7645e1

Change-Id: I6cfc13118873ce2f407fc7e86c25a2ea234f8d1b

Conflicts:

	core/java/android/app/ContextImpl.java
	core/java/android/widget/AbsListView.java
	core/java/android/widget/ProgressBar.java
	core/res/res/values-mcc405/config.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values/bools.xml
	core/res/res/values/config.xml
	packages/SystemUI/res/layout/halo_trigger.xml
	packages/SystemUI/res/values/vanir_arrays.xml
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/ConnectivityService.java
	services/java/com/android/server/NotificationManagerService.java
	services/java/com/android/server/am/ActiveServices.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/power/DisplayPowerController.java
	telephony/java/com/android/internal/telephony/ITelephony.aidl