OSDN Git Service

Merge changes If71fadd2,I42047185 am: 022daeb874
authorChalard Jean <jchalard@google.com>
Tue, 22 Jan 2019 23:20:30 +0000 (15:20 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Jan 2019 23:20:30 +0000 (15:20 -0800)
am: 6d1da29090

Change-Id: Id181b0c617c209bdf01ce25a8920d96025f8421d


Trivial merge