tree c98e2f5b472f8736900486e24b48d21f33604a26
parent 3da38a0771022615ecb568861e489761fe53a05a
parent 35933812b16f0b4221280bbcc3c32f6540996bf2
author Jason parks <jparks@google.com> 1295648332 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1295648332 -0800

Merge "Accquire a wakelock while encrypting." into honeycomb