tree c655512c0088f4922001b9e8e0e86ba704c942a6
parent 5290bf5875a6b7b141e322bd96a53c29855f7cb9
parent 0c9ec1f2b79835360b82b8cc91801a46c4352440
author John Reck <jreck@google.com> 1438651080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438651080 +0000

am 0c9ec1f2: am 2e529712: am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev

* commit '0c9ec1f2b79835360b82b8cc91801a46c4352440':
  Disable skipping frames on empty damage