| commit | edcf9e6ba98810f3892d15d47c235882844d4c20 | [log] [tgz] |
|---|---|---|
| author | Nilesh Agrawal <nileshagrawal@google.com> | Wed Oct 29 07:06:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:06:46 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 97371eda3a45e3243f3bd687a9d0808bbcd35d2c [diff] | |
| parent | e5e395e4e01f82ba96031ab93fe30d9c8e214470 [diff] |
am e5e395e4: am e4ccb341: am ac2ddbb4: am 23c165a9: Merge "Allow 5 hotseat icons in DISABLE_ALL_APPS mode." into jb-ub-now-kermit * commit 'e5e395e4e01f82ba96031ab93fe30d9c8e214470':