OSDN Git Service

resolve merge conflicts of 48bc4c1f420d to stage-aosp-master am: ca0c91b9f1 am: a1110...
authorHugo Benichi <hugobenichi@google.com>
Tue, 20 Jun 2017 09:05:25 +0000 (09:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 09:05:25 +0000 (09:05 +0000)
commit5472f2b36263588d3694e1819727455c5d7a8fc2
treed3acda11db449d3a005bd0480c37ee6b6567ced2
parent45effa2f6a5deff35096584acd0edf9573dc8e1b
parent5347490663b0c695c481a724abbfc3d90c0fa469
resolve merge conflicts of 48bc4c1f420d to stage-aosp-master am: ca0c91b9f1 am: a111068342  -s ours
am: 5347490663

Change-Id: Ibd6c9ef859dcc8b48b632206c59d419ccfed1933