tree c0a2b93009de0dae82d993386a2f0ac57fef43fa
parent a493be5825d15f6a94d1afb5910db075a2a7abc1
parent 6710604286401d4205c27235a252dd0e5008cc08
author Mathias Agopian <mathias@google.com> 1363396474 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1363396475 +0000

Merge "get rid of purgatory and fix QueuesToWindowComposer query" into jb-mr2-dev