tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent 0c81cd847957ccdedbee1d66a73a1ac81f9c9b1e
parent 95aa995dd049fac85a72bff7a6ee40b1a910967f
author Adam Cohen <adamcohen@google.com> 1392410176 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410176 +0000

am 95aa995d: am 1c3b122b: am d9ecec11: Merge "Fixing flash when you swipe a page and go into All Apps (Bug 10971209)" into jb-ub-now-indigo-rose

* commit '95aa995dd049fac85a72bff7a6ee40b1a910967f':