Jeff Brown 3ef7315c95 am d79d97ff: am 47029c2d: am 3f0a57dc: Merge changes Iccea764b,I624b559e into jb-mr1-dev ...

* commit 'd79d97ff1d3023ecd635c57c7a1110cee6b1951b':
  Improve the screen dim duration calculation.
  Implement screen on hack for wireless chargers.

2012-10-02 23:36:47 -07:00

..

com/android/server

am d79d97ff: am 47029c2d: am 3f0a57dc: Merge changes Iccea764b,I624b559e into jb-mr1-dev

2012-10-02 23:36:47 -07:00

Android.mk

Remove obsolete variables.

2012-08-21 17:24:03 -07:00