tree 7eba16ebbabf6aebcbc2d17bcc7a1fa02e222cbf
parent 3eaaf7d1c4d7fbd9eaf66cb8548b91a40e8fb308
parent 23c165a990a5faa11d9b63b437005cf6e3c4d83e
author Nilesh Agrawal <nileshagrawal@google.com> 1392410311 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410311 +0000

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

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