OSDN Git Service

Merge "ConditionManager: don't crash when trying to add unexpected condition" am...
authorThecrazyskull <anaskarbila@gmail.com>
Sun, 4 Jun 2017 00:10:11 +0000 (00:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 4 Jun 2017 00:10:11 +0000 (00:10 +0000)
commit07a97c7d8abeb78914a666734cd6010f4aac1e26
tree494ba07e4bba8707de898ca3d51ea9abfbb93ef7
parent63907a7744f07fc0174776ddaec83e13f66ffcbd
parentecc7355bde25a52dc911d647e433208e30c2d9f3
Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd am: 7151be926d
am: ecc7355bde

Change-Id: Ic422ded3965a9f8bc3cafb7cbf0b1e4585142672
src/com/android/settings/dashboard/conditional/ConditionManager.java