tree a6ab4eef7936bf2c1f33d2e17ab962380c835188
parent 52b456532bd173b6422b24ab215679d1b4da5604
parent 230171daa7a69959130fada320fac82eca8ec690
author Brian Stack <bstack@google.com> 1556902068 -0700
committer android-build-merger <android-build-merger@google.com> 1556902068 -0700

Merge changes from topic "step_event_permission" into qt-dev
am: 230171daa7

Change-Id: Ib22c3385afcec4b2cd8f2c6154d884a331232615