tree 9864474a9da94de20a2b370b1abe0518137c49f9
parent 770e599cf02866bb87e497c62bbe87a45e05cc79
parent 42a60e1b4c64f439e85928123dff4a79d1ca1a2f
author Alexander Dorokhine <adorokhine@google.com> 1591744313 -0700
committer Alexander Dorokhine <adorokhine@google.com> 1591745166 -0700

Merge remote-tracking branch 'aosp/upstream-master' into androidx-master-dev

* aosp/upstream-master:
  Update from upstream, including proto location changes.

Bug: 158587690
Change-Id: Ib6134a09fa8832e980daa3c795775a32a8430c30