Philip Milne b001475fc5 Merge "Fixes for bugs: #6103660, #6103957, #6104457 and #6104322."

2012-03-13 15:32:20 -07:00

..

java

Merge "Fixes for bugs: #6103660, #6103957, #6104457 and #6104322."

2012-03-13 15:32:20 -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