tree acd3e38539512eb037d74a6af7719b655d80b613
parent 410757bcf538add8e7ded57247410da4f43fd838
parent aaa5f9c2799ef8ee63b94b3afdd139cfaab73f8d
author Adrian Roos <roosa@google.com> 1440706386 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440706386 +0000

am aaa5f9c2: am 4b93324d: (-s ours) am def6896d: Fix shifted wallpaper after OTA

* commit 'aaa5f9c2799ef8ee63b94b3afdd139cfaab73f8d':