tree 85afae937965c03518765a7dae54bfe55285e4fa
parent 06a0ac2fea10bde7f5a45e72dea83308773a220d
parent f4ed1be4ef22c87b002c3bca90d130eb77fe5535
author Nilesh Agrawal <nileshagrawal@google.com> 1386620336 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386620337 +0000

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