Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD

Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7

diff --cc core/java/android/bluetooth/BluetoothDevice.java
Simple merge

diff --cc core/java/android/provider/Settings.java
index bae941d,87922b0..bae650e
mode 100755,100644..100755
--- 1/core/java/android/provider/Settings.java
--- 2/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java

diff --cc packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
Simple merge

diff --cc services/core/java/com/android/server/net/NetworkPolicyManagerService.java
Simple merge

diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge

diff --cc tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java
Simple merge

diff --cc tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
Simple merge

diff --cc tools/layoutlib/create/tests/com/android/tools/layoutlib/create/DelegateClassAdapterTest.java
Simple merge