OSDN Git Service

resolve merge conflicts of 430e59d86077cfbbe4421e395ca116768ea02afa to stage-aosp...
authorFlorian Mayer <fmayer@google.com>
Tue, 26 Jun 2018 12:11:43 +0000 (05:11 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 26 Jun 2018 12:11:43 +0000 (05:11 -0700)
commite3623eab8b669ee686d9dc9a8049340b4f6f3545
tree984bac1406bee48d11956703cd29e16df5f76dbb
parent9a6542606f35a4e705393aa52d52f668a75da2dc
parenta1911e70bd1dbc2a282376eefe6a1e2960be6ef1
resolve merge conflicts of 430e59d86077cfbbe4421e395ca116768ea02afa to stage-aosp-master
am: a1911e70bd

Change-Id: Icd6e267b309e678e1136e76160decc259ac8d300