OSDN Git Service

resolve merge conflicts of 48bc4c1f420d to stage-aosp-master am: ca0c91b9f1
authorHugo Benichi <hugobenichi@google.com>
Tue, 20 Jun 2017 08:53:53 +0000 (08:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 08:53:53 +0000 (08:53 +0000)
commit5347490663b0c695c481a724abbfc3d90c0fa469
treed9a1fea11c3c73fd9bb781ac520f2345b0d0425c
parent073299c3255bd4b386c864b922baf2a9f71d1991
parenta111068342a5552537c788ccc76b7d8fab3aa4ac
resolve merge conflicts of 48bc4c1f420d to stage-aosp-master am: ca0c91b9f1
am: a111068342  -s ours

Change-Id: I018561953dbf2290522b11e09aa3ab04cd9df814