OSDN Git Service

Merge changes I1bdeffc6,I3e13db97 am: 568220e911 am: 931d82739b
authorAndreas Gampe <agampe@google.com>
Mon, 29 Jan 2018 22:59:34 +0000 (22:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Jan 2018 22:59:34 +0000 (22:59 +0000)
commit75fa03feeac78b6b194b3270a7bc798b77d22488
tree67014b42d09b5090d8fdcdcfda5a668419165176
parent5564bcde929a934fd41facc585900deeeca18536
parent3ba6c0865828b32e2d7a30f2c003866479fed062
Merge changes I1bdeffc6,I3e13db97 am: 568220e911 am: 931d82739b
am: 3ba6c08658

Change-Id: I88f16a64a1f2eec29a996ef063c07ce4f11f959f