Jim Miller 7478cf86ce Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev

2012-09-21 15:23:34 -07:00

..

java

Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev

2012-09-21 15:21:33 -07:00

jni

Merge "Update layers in a single batch at the beginning of a frame Bug #7186819" into jb-mr1-dev

2012-09-21 10:50:12 -07:00

res

Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev

2012-09-21 15:23:34 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00