| commit | e580f940795da75b920753c75fd4ec43a8db8957 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Mar 17 13:30:14 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 17 13:30:14 2016 +0000 |
| tree | 67fb46ccb525d98c547756d46e616c1b928eb4a5 | |
| parent | 37b179fa8cdde8e00a745cbf030bcb1836e921c4 [diff] | |
| parent | 045e518b554ce164372dc21fc805156bc282b670 [diff] |
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