Jim Miller f1eaf7f439 Merge "Fix 5045008: replace "ring/silence" target in LockScreen with camera app"

2011-08-04 18:06:03 -07:00

..

java

Merge "Fix 5045008: replace "ring/silence" target in LockScreen with camera app"

2011-08-04 18:06:03 -07:00

jni

Merge "Adapt TextLayoutCache for new Harfbuzz scripts"

2011-08-04 09:41:53 -07:00

res

Merge "Fix 5045008: replace "ring/silence" target in LockScreen with camera app"

2011-08-04 18:06:03 -07:00

tests

Merge "Fix AnimatorSet cancellation issues"

2011-08-04 15:47:21 -07:00