Jeff Brown 25f5a71f31 am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev ...

* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
  Allow phone to go to sleep while in call.

2012-10-04 17:35:29 -07:00

..

java

am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev

2012-10-04 17:35:29 -07:00

jni

am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev

2012-10-03 16:01:15 -07:00

res

Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev

2012-10-04 12:38:24 -07:00

tests

…