tree 6d95a1ad85c26ca0e7500123a7d77c09e05236ca
parent df5ba9bfeb8e77522fbea7cb60bd0d9da8fb5276
parent 3a27585df77997b5ea01a086b739ee6866000444
author Jeff Sharkey <jsharkey@android.com> 1382551981 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382551981 -0700

am 3a27585d: am a9a6007c: Merge "Treat document thumbnails as preemptable." into klp-dev

* commit '3a27585df77997b5ea01a086b739ee6866000444':
  Treat document thumbnails as preemptable.