tree bdb916ce0f52ed95294260110761c4d563f76bfc
parent ac2ddbb4277fd3be025acfdfa930b9f71c9b5ce4
parent 93b6ee6dfaa954747c9b107e147d57ea4866f78d
author Nilesh Agrawal <nileshagrawal@google.com> 1392410312 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410312 +0000

am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit

* commit '93b6ee6dfaa954747c9b107e147d57ea4866f78d':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."