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

* commit 'a1f739ea83b6d770b8469ae1c2c4161f6fe96334':
  Change android.permission.SERIAL_PORT to signature|system.

2012-10-19 00:02:41 -07:00

..

java

am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.""" into jb-mr1-dev

2012-10-18 21:05:29 -07:00

jni

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

2012-10-17 19:18:24 -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