tree 10da860fcff71886af91d082e31f0e1917926848
parent 62cad76921d1ce988c1c86133802e602b7fb8132
parent 33cddd186afe9134f241295a960ac5384166ae3e
author Nilesh Agrawal <nileshagrawal@google.com> 1414566409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566409 +0000

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

* commit '33cddd186afe9134f241295a960ac5384166ae3e':