OSDN Git Service

resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master am: 8228eb3446
authorLorenzo Colitti <lorenzo@google.com>
Tue, 18 Jul 2017 23:44:17 +0000 (23:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 23:44:17 +0000 (23:44 +0000)
commit9e06896a03bb36ec0ef0d69c88ecf7937af6bf77
tree5c3ccdbc41c9cebf1d6abde685fb752a9cbc666c
parent6b43433062c0c6b08b486e3be428d57364338ad4
parent6a5fe34edfa75c4282db6fade142d582b0c8cd92
resolve merge conflicts of a1d67fb38ec0 to stage-aosp-master am: 8228eb3446
am: 6a5fe34edf  -s ours

Change-Id: Ie520e145c7c97841ac36970c62633962eed8b30b