tree 10da860fcff71886af91d082e31f0e1917926848
parent edcf9e6ba98810f3892d15d47c235882844d4c20
parent f448e23f12379ca43e9ca930977cf4185ca8af92
author Nilesh Agrawal <nileshagrawal@google.com> 1414566407 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566407 +0000

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

* commit 'f448e23f12379ca43e9ca930977cf4185ca8af92':