OSDN Git Service

Merge \"Pre-setup restrictions\" into nyc-dev
authorJason Monk <jmonk@google.com>
Tue, 19 Jul 2016 20:37:15 +0000 (20:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Jul 2016 20:37:15 +0000 (20:37 +0000)
commit47d17a4f186a6f277db527fb25e486230859311f
tree02bdd2915fa8500360aaa594efd1f9a16a354d4e
parent9c3d64caef85096f50f56f18c81814e25b057f9a
parentf84c05c3607e32b311ed3f707308d69cfdd86161
Merge \"Pre-setup restrictions\" into nyc-dev
am: f84c05c360

Change-Id: I2902c765eeacdbe05a393b01936572233c783988
packages/SettingsLib/src/com/android/settingslib/HelpUtils.java
packages/SettingsLib/src/com/android/settingslib/drawer/TileUtils.java