tree cba62d0d64153aa2169651696bc238591341d679
parent f448e23f12379ca43e9ca930977cf4185ca8af92
parent 2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87
author Nilesh Agrawal <nileshagrawal@google.com> 1414085531 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085531 +0000

am 2ef2511f: am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS mode.

* commit '2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87':