OSDN Git Service

resolve merge conflicts am: 1382d8d50e
authorBeverly <beverlyt@google.com>
Wed, 20 Jun 2018 16:08:43 +0000 (09:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jun 2018 16:08:43 +0000 (09:08 -0700)
commit1d1a687be2ad224e436d46d01a899150b416e682
tree1d8e525a40c4b2f0bdffeeea0b8fc9c2b2d04204
parentf0c380738ed8c614c37cdd84ac452f16763dbcf0
parent2a26696351e557e62efd221e47a1fd069d2d3bb6
resolve merge conflicts am: 1382d8d50e
am: 2a26696351

Change-Id: I1839ccf3a2cd0fe1d6704994b49cfa36e392ba91