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)
commit64a7ccc1c59954685eefb2a1c1571dbaa81d1fbc
tree26bfbbd7e8124711a1ec7c8789a32b47b5c421a6
parentba81211c4840c7456d1263d008e8b036f45a29fe
parent1ad99fb064b4720fcec105098d8d3af027e6f712
Merge changes Id598ae1d,I475bd011
am: 1ad99fb064

Change-Id: Ic02f8d900b6b430dc1a8bbfdc03297ad52157390