commit | 62cad76921d1ce988c1c86133802e602b7fb8132 | [log] [tgz] |
---|---|---|
author | Nilesh Agrawal <nileshagrawal@google.com> | Wed Oct 29 07:06:47 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:06:47 2014 +0000 |
tree | 10da860fcff71886af91d082e31f0e1917926848 | |
parent | edcf9e6ba98810f3892d15d47c235882844d4c20 [diff] | |
parent | f448e23f12379ca43e9ca930977cf4185ca8af92 [diff] |
am f448e23f: am d1ce093c: am 03ec57d3: am 93b6ee6d: Merge "Revert "Allow 5 hotseat icons in DISABLE_ALL_APPS mode."" into jb-ub-now-kermit * commit 'f448e23f12379ca43e9ca930977cf4185ca8af92':