tree f30bfbb6ad34352bb0ee572d7eec3ad42ddd1134
parent 2463353c01d96ec6a2e321a5c14fcbb4da7c782a
parent ad3a9bb628e912b39e10f8d8a8bde0badefd8bd0
author Craig Mautner <cmautner@google.com> 1331332845 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1331332845 -0800

Merge "Fix state machine sequence causing wallpaper flash."