Craig Mautner 59a9cc18f3 am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev ...

* commit '444354d2c62de37b65782f15c864af21086b4b04':
  Allow getDisplayContentLocked to return null...

2012-10-19 09:32:19 -07:00

..

java

am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev

2012-10-19 09:32:19 -07:00

jni

am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev

2012-10-17 19:21:20 -07:00

res

am 01e99ada: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev

2012-10-19 00:05:39 -07:00

tests

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

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