OSDN Git Service

am e4ccb341: am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_AP...
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)
commite5e395e4e01f82ba96031ab93fe30d9c8e214470
treecba62d0d64153aa2169651696bc238591341d679
parent142c274b1d25bb46bc97ffc3acc0b2cb4f7de3b6
parente4ccb341d890e01e1f365c1ed8880a581985c034
am e4ccb341: am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit

* commit 'e4ccb341d890e01e1f365c1ed8880a581985c034':