tree 71ee09dc914da19a0241372fb5937eff5f4bcb69
parent 9cd7302d7df9a002d554e2aaf15bf535a822aa6a
parent e6ce2405a578d5eab2c461ec7cb90eadd33f1a8f
author Winson Chung <winsonc@google.com> 1392411670 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411670 +0000

am e6ce2405: 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 'e6ce2405a578d5eab2c461ec7cb90eadd33f1a8f':
  Save and restore the correct content type when rotating while in AllApps.