tree 96f3d8398acee21bdb7435baaf090e29f4d81d8a
parent 8b38213f3ca787fc088554676dcab0acac694279
parent ae71ccdda90992bb7c52b0bb2e224fcd18b45fb4
author Fan Zhang <zhfan@google.com> 1547775555 -0800
committer android-build-merger <android-build-merger@google.com> 1547775555 -0800

[automerger skipped] Merge "Add Dynamic tiles for Settings" am: b576e24d73 am: af4605f4d6
am: ae71ccdda9 -s ours
am skip reason: change_id I042d39bfde0875cb4f88b4994ac1e9856e7e6a0a with SHA1 0390f63bd4 is in history

Change-Id: I5140c1824a4b5d795f82fc15d3be8a922d21f499