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

am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit

* commit 'd1ce093cf026ca3ee3072adeca13e28c97d34b68':