tree cba62d0d64153aa2169651696bc238591341d679
parent 142c274b1d25bb46bc97ffc3acc0b2cb4f7de3b6
parent e4ccb341d890e01e1f365c1ed8880a581985c034
author Nilesh Agrawal <nileshagrawal@google.com> 1414085530 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085530 +0000

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

* commit 'e4ccb341d890e01e1f365c1ed8880a581985c034':