Jeff Brown 9dc348d756 Merge "Fix spurious ANRs in native activities."

2012-03-13 15:15:48 -07:00

..

java

Merge "Check for null characters being used in camera parameters."

2012-03-13 13:03:48 -07:00

jni

Merge "Fix spurious ANRs in native activities."

2012-03-13 15:15:48 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-03-13 14:25:11 -07:00

tests

Merge "Move LocalUtil unit tests from Frameworks to CTS"

2012-03-13 12:51:59 -07:00