tree ea93cb5a7b18481be209bd0b1fd08e87d43d372b
parent 4e561fb9cbca0055178575b251a6b8547f2073f3
parent cdc8c101eba7dea45fa768cb83c0fd815cce5c35
author Philip P. Moltmann <moltmann@google.com> 1576811095 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1576811095 +0000

Merge "Adjust to changed internal API"