Ying Wang 044a0b8ae5 Merge "Build all test apks as raw resource in FrameworksCoreTests."

2012-01-10 16:37:43 -08:00

..

java

am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

2012-01-10 10:34:51 -08:00

jni

Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE

2012-01-09 21:36:22 +00:00

res

Merge "Add textDirection="locale""

2012-01-09 10:46:03 -08:00

tests

Build all test apks as raw resource in FrameworksCoreTests.

2012-01-10 15:12:10 -08:00