OSDN Git Service

Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
authorjoshmccloskey <joshmccloskey@google.com>
Tue, 9 Jul 2019 23:05:43 +0000 (16:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Jul 2019 23:05:43 +0000 (16:05 -0700)
am: 007a1aee1b

Change-Id: Iff53397eed65d53a1cc53b01b85d9dab1f004ee3


Trivial merge