tree 10da860fcff71886af91d082e31f0e1917926848
parent 8e1b57ee84c7514c8e1934dc88cefac06cffae41
parent fe6d777517c162a04f8f446ff3b7b0eb383f1e98
author Winson Chung <winsonc@google.com> 1414566343 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566343 +0000

am fe6d7775: 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 'fe6d777517c162a04f8f446ff3b7b0eb383f1e98':