Craig Mautner 0ed07a0a30 Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev

2012-10-19 09:27:06 -07:00

..

java

Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev

2012-10-19 09:27:06 -07:00

jni

Take into account the texture layer's transform for clipping

2012-10-17 18:18:35 -07:00

res

Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev

2012-10-18 23:59:37 -07:00

tests

Fix connectivity manager test for tablet with data connection, multi-user support

2012-10-17 12:03:29 -07:00