Wu-cheng Li b90a70d154 Merge "Improve camera face detection javadoc." into ics-mr1

2011-11-15 06:14:11 -08:00

..

java

Merge "Improve camera face detection javadoc." into ics-mr1

2011-11-15 06:14:11 -08:00

jni

Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1

2011-11-14 12:25:53 -08:00

res

Merge "Fix bug 5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1

2011-11-14 19:47:55 -08:00

tests

Merge "Conservatively trim data usage stats." into ics-mr1

2011-11-14 23:37:17 -08:00