OSDN Git Service

resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a am:...
authorPavlin Radoslavov <pavlin@google.com>
Wed, 15 Mar 2017 05:58:21 +0000 (05:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 15 Mar 2017 05:58:21 +0000 (05:58 +0000)
commitb4e34476e901f38bc5e846adb0a3bf12b8d53564
treeb61df87fb03e135bf569f730d0f058416acf1dc2
parent5a9925784a4a34811ae29608b67dee4a580c226b
parent0796aaa0475fe46c5206210da790ae1cdd23b5c5
resolve merge conflicts of a3ee2e35 to nyc-dev am: a33dd28064 am: b75b8e7f1a am: d4f1f0e048
am: 0796aaa047

Change-Id: I216fb8bc48e84793e3c397c60f4311796ce5ef83