Jeff Brown 66fead4227 am 006ba8a2: am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev ...

* commit '006ba8a226236af2189e62a221ae932344b79210':
  Flatten power manager wake lock constants.

2012-07-27 18:26:27 -07:00

..

java

am 006ba8a2: am af3fb232: Merge "Flatten power manager wake lock constants." into jb-mr1-dev

2012-07-27 18:26:27 -07:00

jni

Merge "Rename drawGeneralText to drawText" into jb-mr1-dev

2012-07-27 16:42:52 -07:00

res

Import translations. DO NOT MERGE

2012-07-26 13:55:40 -07:00

tests

Merge "Update WifiManager API"

2012-07-25 12:25:13 -07:00