tree 71ee09dc914da19a0241372fb5937eff5f4bcb69
parent 195dd27c8fcfb830c26d27df7d3c8d054139ee6e
parent aedae798333b4042d3741426b6bdfb60344b942e
author Winson Chung <winsonc@google.com> 1392411208 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411208 +0000

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

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