tree e86836e061947fc2ee407558c1cfd22bb5fa7c56
parent c7cfb79037986c261855d875d0f14c5cc9d38399
parent be8ff1f4077c127933173dd292413d1b853052f8
author Winson Chung <winsonc@google.com> 1392410262 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410262 +0000

am be8ff1f4: am d7adbab6: Merge "Save and restore the correct content type when rotating while in AllApps." into jb-ub-now-jolly-elf

* commit 'be8ff1f4077c127933173dd292413d1b853052f8':
  Save and restore the correct content type when rotating while in AllApps.