OSDN Git Service

Merge changes I768f0948,I3d79bb35
authorElliott Hughes <enh@google.com>
Wed, 6 Dec 2017 03:41:38 +0000 (03:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Dec 2017 03:41:38 +0000 (03:41 +0000)
am: 2474ba9744

Change-Id: I04aec22a4eefac8439e101a6f28817e4f90b7bc9


Trivial merge