Justin Ho 76a0142477 am 871a6d7d: Merge "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 ...

* commit '871a6d7d4fb3bffaff37e45f0b4f5e3c862239d2':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."

2012-10-17 16:00:37 -07:00

..

java

am 871a6d7d: Merge "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-17 16:00:37 -07:00

jni

am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev

2012-10-17 10:23:42 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-10-16 21:11:18 -07:00

tests

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

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