tree 5ab20a8cc2ed28d583a8f74afa8d50a94791ef62
parent b1a0da1098772f2369dcbbd18ac41656117e9b57
parent b02ae636be4008c5b3e13cf406249861bd80370e
author Fan Zhang <zhfan@google.com> 1550083847 -0800
committer android-build-merger <android-build-merger@google.com> 1550083847 -0800

Merge "Revert "Enable static overlay for SettingsLib resources"" am: accbb6b3c6 am: 495690c247
am: b02ae636be

Change-Id: Ia79fec43e2594f0a2c30043cac83165d794a7f35