OSDN Git Service

Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
authorJoshua Mccloskey <joshmccloskey@google.com>
Wed, 10 Jul 2019 02:45:57 +0000 (19:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Jul 2019 02:45:57 +0000 (19:45 -0700)
am: 0839185647

Change-Id: I3d79f210409ffbeea116882368f82abf218e6de7


Trivial merge