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