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)
commit2c54efa0445762e8e57961367b8d76133ed5246d
tree2e7e545910c882cb3e201706107733404a18a986
parentad8c2eb2431d42627f391f8be9d55fa628bb32f6
parent2f5f475c3ee524d4f853c58a8792743c1734c5d7
Merge changes I768f0948,I3d79bb35 am: 2474ba9744
am: 2f5f475c3e

Change-Id: I1da4a3a88c893d8ed5359e4b985a9e8ae9774535