tree 41090401fb4d53703d60dc77114207f3057da888
parent d1ce093cf026ca3ee3072adeca13e28c97d34b68
parent 0d43ba8c91b4e6cc678cb5cd762f7a38c4406a51
author Nilesh Agrawal <nileshagrawal@google.com> 1392411267 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411267 +0000

am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.

* commit '0d43ba8c91b4e6cc678cb5cd762f7a38c4406a51':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.