Jeff Brown eb1d804246 am 01d63a35: am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev ...

* commit '01d63a35245ad20cf5251b69777db5c81fc76a84':
  Fix typo that causes dreaming on battery.

2014-02-25 00:40:54 +00:00

..

java/com/android/server

am 01d63a35: am ae8106ef: am 2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev

2014-02-25 00:40:54 +00:00

jni

am 5f652b9f: am 0cab896a: resolved conflicts for merge of 9e413bf4 to klp-modular-dev-plus-aosp

2014-02-22 00:46:52 +00:00

Android.mk

…