tree 64d5d2f0bd6957be4e2ed84a0f04a30e9f818b67
parent 9a7ac5b57ef6f341f6fc3c7c34224fb2046ec085
parent 3e861c24de3802b703ac71624cf7d0553d7105a5
author Elliott Hughes <enh@google.com> 1588171471 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588171471 +0000

Merge "Backport upstream r1246." am: 3e861c24de

Change-Id: I9bdd9951b2607afee045c1956332dc032aaec8c0