OSDN Git Service

am 2ef2511f: am 0d43ba8c: am da41ea66: Allow 5 hotseat icons in DISABLE_ALL_APPS...
authorNilesh Agrawal <nileshagrawal@google.com>
Thu, 23 Oct 2014 17:32:11 +0000 (17:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Oct 2014 17:32:11 +0000 (17:32 +0000)
* commit '2ef2511f03563f8ddd7d2f6e38fc215f14bbbc87':


Trivial merge