OSDN Git Service

Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
authorJason Monk <jmonk@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)
commit8dd1b68b6ff4f18cdf0c0e4a010e3add69aed85b
tree6e142b24a64d5339189189d5b92778a8f9908907
parent64de61e683e2ffa77242d14ce5c681e38adc51ee
parente580f940795da75b920753c75fd4ec43a8db8957
Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
am: e580f94

* commit 'e580f940795da75b920753c75fd4ec43a8db8957':
  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