OSDN Git Service

Merge changes I00124a28,Id3a4e755
authorAndreas Gampe <agampe@google.com>
Tue, 12 Jun 2018 21:54:03 +0000 (14:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jun 2018 21:54:03 +0000 (14:54 -0700)
commitbac7cfe3ee1bd74355165df6eb99f141f70fbd44
treef5978cc44ed058c696be749746396671b4deb139
parent1f0a6a3fb0e223391cea0eeef9d108acba4791e9
parent5ab00327028410686b80a0b8d9aead34f5f7ab9e
Merge changes I00124a28,Id3a4e755
am: 5ab0032702

Change-Id: Idb7e486122cc464fa60e1563720896aaa18b5ace