tree 1c5c28aa0ff0daff065ff9e96d68bc129faeeaed
parent e4ccb341d890e01e1f365c1ed8880a581985c034
parent 03ec57d313f3f72b76f3df0cc4a297d3788847e5
author Nilesh Agrawal <nileshagrawal@google.com> 1392411266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411266 +0000

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

* commit '03ec57d313f3f72b76f3df0cc4a297d3788847e5':
  Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."