tree 0b5f9f0ab495f34097724df6c7c771e6264b2700
parent 6666c6d236e82725b6c49dc3fae0e84f66f6102d
parent 7592d8332c301ca0999a3f441e189cc899552382
author Haibo Huang <hhb@google.com> 1614761733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614761733 +0000

Merge changes from topic "add_androidbp" am: 12b0627cc1 am: 518ffcf2b7 am: b668dca8fd am: 7592d8332c

Original change: https://android-review.googlesource.com/c/platform/external/oboe/+/1594982

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70af03b180d8664e767ddbd37a72ee3d6737f827