Baligh Uddin 5965b7f367 Merge "Import translations. DO NOT MERGE"

2012-10-17 22:25:01 -07:00

..

java

am 22bd3726: am 76a01424: 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:06:15 -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

Merge "Import translations. DO NOT MERGE"

2012-10-17 22:25:01 -07:00

tests

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

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