Prashant Malani 7010d230ca am 673d8659: am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev automerge: 9d2a478 ...

* commit '673d86591feff675eb7970486f3815b2c43916f2':
  Don't animate screen brightness if there is a pending off transition

2014-11-15 10:21:09 +00:00

..

java/com/android/server

am 673d8659: am 4d269ba3: am fb26a2c8: Merge "Don\'t animate screen brightness if there is a pending off transition" into lmp-sprout-dev automerge: 9d2a478

2014-11-15 10:21:09 +00:00

jni

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

Android.mk

…