OSDN Git Service

Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD
authorBill Yi <byi@google.com>
Wed, 17 Feb 2016 19:38:55 +0000 (11:38 -0800)
committerBill Yi <byi@google.com>
Wed, 17 Feb 2016 19:38:55 +0000 (11:38 -0800)
commit2528fcdfbd5d674c00387ed4ce93546ea5581ede
tree61e0e2bf8d13e3ba858824c784868a0c941b1720
parente2fc25722a8477be5700355a3a43a02f0d8e29df
parent26ada7e78993241d702a908eae93d174cbb3c8b3
Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD

Change-Id: Ifc45930160cf01ee78ecfbfdc48697055f82e0a7
core/java/android/bluetooth/BluetoothDevice.java
core/java/android/provider/Settings.java
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDevice.java
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
services/core/java/com/android/server/wm/WindowManagerService.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateClassAdapter.java
tools/layoutlib/create/src/com/android/tools/layoutlib/create/DelegateMethodAdapter.java
tools/layoutlib/create/tests/com/android/tools/layoutlib/create/DelegateClassAdapterTest.java