OSDN Git Service

Merge 'aosp/upstream-master' into 'aosp/master' am: 24cb462579
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 6 Mar 2020 00:48:15 +0000 (00:48 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 6 Mar 2020 00:48:15 +0000 (00:48 +0000)
Change-Id: I5d46b2f8589803ff4fa80a99e785a280512951a6


Trivial merge