tree 239a62b59c57b4b95d8e82943bf9a48e84439819
parent 76e7430baead21c67fd4c81a36774a6461d2fb99
parent 9c0f621c9dc74df881bde6f873b6d5e056a730a1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582285441 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582285441 +0000

[automerger skipped] Merge "Cleanup framework-all usage" am: 38ca6040ea am: 5c7bc2062f am: 9c0f621c9d -s ours
am skip reason: Change-Id I16e672aaae80d8bcce25e46c34984797740aae1b with SHA-1 6fb18bbfdb is in history

Change-Id: I7c23c879458b0d9a9b0801fe140e1896a56cee5f