tree 5f11de2691e30d7e1ac62512c06e4e95c45111ca
parent ad462dd108fd627647e6a77004b4af57ccbdcacb
parent 476883c54ed12a0b4130adcda73ca322f08f6238
author Winson Chung <winsonc@google.com> 1383611765 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383611765 -0800

am 476883c5: am e494aaf7: Merge "Initial changes to support AllApps on various form factors." into jb-ub-now-jetsonic

* commit '476883c54ed12a0b4130adcda73ca322f08f6238':
  Initial changes to support AllApps on various form factors.