tree c8ec5a1be802be4c0dcaf072b837664f89fd1cd4
parent a62da52365dc341c76085659612a2f06facf15e2
parent 4455fc734c34e741e7d96a75b18106fa5df1253b
author Will Harmon <xlythe@google.com> 1465413682 +0000
committer android-build-merger <android-build-merger@google.com> 1465413682 +0000

Merge \"Fix crash when an app with an active quicksettings tile is updated to no longer have that tile.\" into nyc-dev
am: 4455fc734c

Change-Id: I391ada63a040537925d8b8a8151d0e6d49a6e69b