tree 78c0d3bc6eb96b7dc15b29a22bfe0487fe4938c4
parent f3142095fda28cbe2355aaad897b68e94b022f97
parent 3f30e67afbceb185c52833cec539cc0199716ef0
author Chris Craik <ccraik@google.com> 1379029516 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379029516 -0700

am 3f30e67a: am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into klp-dev

* commit '3f30e67afbceb185c52833cec539cc0199716ef0':
  Move DeferredDisplayState out of ops