tree da538ef3e0182f2e46f4738cc9011bdcbf4c638e
parent 23c165a990a5faa11d9b63b437005cf6e3c4d83e
parent d85ee9b994e21cb500c89349ce31ce89e564b513
author Nilesh Agrawal <nileshagrawal@google.com> 1386621605 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386621605 +0000

Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit