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