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

* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2':
  Fix 4560303: Add setting to lock later when power button pressed

2012-01-10 10:34:51 -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 (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

2012-01-08 13:19:13 +00:00

res

Merge "Add textDirection="locale""

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

tests

Add textDirection="locale"

2012-01-06 11:29:18 -08:00