Merge "Merge "QS Edit: clean up tile adapter" into nyc-dev am: cbcefaf85c am: aecf9510b3" into nyc-mr1-dev-plus-aosp
am: dc30d6ee69
* commit 'dc30d6ee69e7c56e1876a624fd79e5161a755193':
Change-Id: Ic668b5ee98c20b6489916c9067019e6230198a4a
This commit is contained in: