tree 41090401fb4d53703d60dc77114207f3057da888
parent a24de4229430cf89418e8a4a09fb0241bc7135b3
parent 2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87
author Nilesh Agrawal <nileshagrawal@google.com> 1392411745 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411745 +0000

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

* commit '2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87':
  Allow 5 hotseat icons in DISABLE_ALL_APPS mode.