Jim Miller 7b7a8ca615 am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1 ...

* commit '352987e0889b6fa8862f489bc31ba7e9de8d1cbe':
  Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]

2011-03-10 23:01:42 -08:00

..

config

…

java

am 352987e0: Merge "Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]" into honeycomb-mr1

2011-03-10 23:01:42 -08:00

jni

Merge "Teach the framework to use the new android_reboot() function." into honeycomb-mr1

2011-03-10 19:24:42 -08:00

res

am ff25b975: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

2011-03-10 14:47:57 -08:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00