tree b6dfb522e2c1530bd42d219f8afc2c25660497db
parent c99c5f6edf55bf9f9fbdbef3e22a6d47ef8ea6d3
parent 5bd84d31630070fb9fb325fcdee20ae195b2d24f
author Jordan Liu <jminjie@google.com> 1574716171 -0800
committer android-build-merger <android-build-merger@google.com> 1574716171 -0800

[automerger skipped] Remove reference to hidden framework resource am: 7d898287e4 am: e038d472a9
am: 5bd84d3163 -s ours
am skip reason: change_id Ic79837ccbd6fdb1a5ac3fea7a436408b9f30bcba with SHA1 9b8136c0cf is in history

Change-Id: I32a2190ccfd3e4db6041a74af20d231fdf55369a