tree 3bef4f9c9ee665de70add3978e0b126003b875fc
parent b8336373ffe1c39532e4645cbcc938c7676f3943
parent ac2ddbb4277fd3be025acfdfa930b9f71c9b5ce4
author Nilesh Agrawal <nileshagrawal@google.com> 1392411266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411266 +0000

am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit

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