OSDN Git Service

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

Change-Id: I1da4a3a88c893d8ed5359e4b985a9e8ae9774535


Trivial merge