| commit | a24de4229430cf89418e8a4a09fb0241bc7135b3 | [log] [tgz] |
|---|---|---|
| author | Nilesh Agrawal <nileshagrawal@google.com> | Fri Feb 14 21:02:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 21:02:24 2014 +0000 |
| tree | 1c5c28aa0ff0daff065ff9e96d68bc129faeeaed | |
| parent | dfa1993e654cdfb3c54059ee21ef6190ebb8ca22 [diff] | |
| parent | d1ce093cf026ca3ee3072adeca13e28c97d34b68 [diff] |
am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit * commit 'd1ce093cf026ca3ee3072adeca13e28c97d34b68': Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."