OSDN Git Service

Merge changes I768f0948,I3d79bb35 am: 2474ba9744 am: 2f5f475c3e
authorElliott Hughes <enh@google.com>
Wed, 6 Dec 2017 04:02:10 +0000 (04:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Dec 2017 04:02:10 +0000 (04:02 +0000)
am: 2c54efa044

Change-Id: I7a4128ad78a99ec06d048511c243144f20d424c8


Trivial merge