tree 7d2a0daaadfcc0700c169a99d9e294881e846735
parent 6a63dce9b9faffa6d791f540e82ce59fc485ace3
parent cc8f17b2dd676b3498f26e314591e198b63b5f15
author Hall Liu <hallliu@google.com> 1551834355 -0800
committer android-build-merger <android-build-merger@google.com> 1551834355 -0800

Merge "API tweaks" am: 13152049e9
am: cc8f17b2dd

Change-Id: I30c2e7b3759938c76e7b2ad73f62b44a13823645