OSDN Git Service

Merge changes Id598ae1d,I475bd011
authorChalard Jean <jchalard@google.com>
Mon, 22 Apr 2019 02:29:00 +0000 (19:29 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Apr 2019 02:29:00 +0000 (19:29 -0700)
am: 1ad99fb064

Change-Id: Ic02f8d900b6b430dc1a8bbfdc03297ad52157390


Trivial merge