Jeff Brown 655410e7b3 am 5c74bca4: Merge "Synthesize fake vsyncs when the screen is off." into jb-dev ...

* commit '5c74bca49a48c3316aca9fed00d287cb8cbc2be4':
  Synthesize fake vsyncs when the screen is off.

2012-06-14 21:32:36 -07:00

..

java

am 5c74bca4: Merge "Synthesize fake vsyncs when the screen is off." into jb-dev

2012-06-14 21:32:36 -07:00

jni

am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev

2012-06-14 20:31:15 -07:00

res

am 97c11fe3: Merge "Import translations. DO NOT MERGE" into jb-dev

2012-06-14 12:22:57 -07:00

tests

resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp

2012-06-08 13:47:46 -07:00