OSDN Git Service

am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABL...
authorNilesh Agrawal <nileshagrawal@google.com>
Thu, 23 Oct 2014 17:32:10 +0000 (17:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:32:10 +0000 (17:32 +0000)
commitf448e23f12379ca43e9ca930977cf4185ca8af92
treecba62d0d64153aa2169651696bc238591341d679
parente5e395e4e01f82ba96031ab93fe30d9c8e214470
parentd1ce093cf026ca3ee3072adeca13e28c97d34b68
am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit

* commit 'd1ce093cf026ca3ee3072adeca13e28c97d34b68':