tree 2ec9e7f0a9ccacb850b936f54ba8e445e2c49212
parent e4a5c47fab959c857bf9e95947211152738b4894
parent 202d7a4f483ba4301abc7a0672c5acd243b986ec
author Will Harmon <xlythe@google.com> 1465414873 +0000
committer android-build-merger <android-build-merger@google.com> 1465414873 +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 am: 81f69753ed
am: 202d7a4f48

Change-Id: Id1cb31d3ad2d8fe1f1e8c0c89ae27275c799e550