tree b6dfb522e2c1530bd42d219f8afc2c25660497db
parent 53d8adf39452b1e4c8d8db1fc5cc15b18999623b
parent 4bd170390ae7c56309b22713b37ce485a06f3b1e
author Jordan Liu <jminjie@google.com> 1574710066 -0800
committer android-build-merger <android-build-merger@google.com> 1574710066 -0800

[automerger skipped] Clean up hidden constants am: be4fe78e0a am: 3492f71078
am: 4bd170390a -s ours
am skip reason: change_id I6e0b527d75987825ee70b6f7ac3b42331bc22571 with SHA1 5e17455390 is in history

Change-Id: Ic8a8fc926ca00ab5c49eabb4708a69f91a4168ab