Fabrice Di Meglio da391700c9 resolved conflicts for merge of e549a602 to master ...

Change-Id: I37dc0e48321d4baea49d77b6ef22bca19dcb0d9b

2012-10-19 12:49:30 -07:00

..

java

resolved conflicts for merge of e549a602 to master

2012-10-19 12:49:30 -07:00

jni

am 3786a9b9: 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:23:27 -07:00

res

am 01d2c64a: am 7404f28b: am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev

2012-10-19 11:07:12 -07:00

tests

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

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