OSDN Git Service

Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
authorJason Monk <jmonk@google.com>
Thu, 17 Mar 2016 13:30:14 +0000 (13:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Mar 2016 13:30:14 +0000 (13:30 +0000)
commite580f940795da75b920753c75fd4ec43a8db8957
tree67fb46ccb525d98c547756d46e616c1b928eb4a5
parent37b179fa8cdde8e00a745cbf030bcb1836e921c4
parent045e518b554ce164372dc21fc805156bc282b670
Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev

* changes:
  Fix battery history detail up
  Fix clickability of conditionals
  Try to recycle prefs in battery summary
  Don't use animations for security settings
  Fix Settings home lifecycle