tree 00bd02f966269fe724554c7a1f1146acd138d3f9
parent 3cb86769fd04891f01e2ea8fcf54edb9ecb97922
parent 88ee0dac81dec12aefdeee23072df9b3864a06a4
author Chris Craik <ccraik@google.com> 1379023887 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379023887 -0700

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

* commit '88ee0dac81dec12aefdeee23072df9b3864a06a4':
  Move DeferredDisplayState out of ops