OSDN Git Service

Merge 'aosp/upstream-master' into 'aosp/master' am: 24cb462579 am: 88b0a4235a am...
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 6 Mar 2020 01:16:51 +0000 (01:16 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 6 Mar 2020 01:16:51 +0000 (01:16 +0000)
Change-Id: I9005bb07b0fee743a6bc469270c7df8908a811d6


Trivial merge