OSDN Git Service

Merge changes I74d677dc,I17f4db85 into qt-dev
authorKevin Chyn <kchyn@google.com>
Tue, 30 Apr 2019 07:05:57 +0000 (00:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 Apr 2019 07:05:57 +0000 (00:05 -0700)
am: 8888d346d1

Change-Id: I0d6523d1a67b4dd1c99d30ebcdd3637535944983


Trivial merge