Dianne Hackborn 49e9b0ad5f am 1668b19d: Merge "Battery stats tweaks." ...

* commit '1668b19d4ce7361144a6668b52434508d8311ab2':
  Battery stats tweaks.

2014-05-09 22:43:09 +00:00

..

java

am 1668b19d: Merge "Battery stats tweaks."

2014-05-09 22:43:09 +00:00

jni

Fix Bitmap.cpp line endings

2014-05-09 13:59:36 -07:00

res

am 02701776: Merge "resolved conflicts for merge of 88aa8aab to master"

2014-05-09 22:26:04 +00:00

tests

Introduce new API for floating window support

2014-05-09 19:17:15 +09:00