tree 5fc7c4018275eb2247d8d893f6d55abb15953e31
parent 3bb5a01e9c6e793b895276414511026f3a58a1ed
parent 386c2d78bd4077a0b9c7c18228ced5cc044a9f5e
author Orion Hodson <oth@google.com> 1596058650 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596058650 +0000

[automerger skipped] Merge "startop: Add yawanng@ to OWNERS list" am: ee536d0e12 am: 386c2d78bd -s ours

am skip reason: Change-Id Iaee1a3d608593238284c9b07d34d1042538ec612 with SHA-1 ccc3ea7a57 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378296

Change-Id: I0bc38946953209dc5b204e7cc9b852e0ab9e564a