tree 628f35645db21be84f3bf0dea726d78a1dc495ec
parent 11bbd9e27cf642eae0b50aed3a7d9044c3ff92bd
parent 6e8c039e24a66bbaca61e596a2d5ae97a734077d
author Jason Monk <jmonk@google.com> 1486396598 +0000
committer android-build-merger <android-build-merger@google.com> 1486396598 +0000

Merge "Add tile information to ACTION_QS_TILE_PREFERENCES intent" am: ff1d8da55e am: 74a8b6543f am: a8e10e5f20
am: 6e8c039e24

Change-Id: If9ed9697cc042375abd3d77b1eb4020d2798f96c