tree 4ec70a60dd149e22921137b96cb4aa2d4c0ef3dd
parent 32f3e15c77bd294b43c02229708d4047faaa8830
parent 4732660a50f3373812e8ae55cbda264d469bfded
author Craig Mautner <cmautner@google.com> 1381521005 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381521005 -0700

am 4732660a: am ab3276dd: Merge "Make an exception for screenshot optimization." into klp-dev

* commit '4732660a50f3373812e8ae55cbda264d469bfded':
  Make an exception for screenshot optimization.