OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev
authorDmitry Dementyev <dementyev@google.com>
Thu, 9 Mar 2017 18:19:10 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 9 Mar 2017 18:19:10 +0000 (18:19 +0000)
commit8c5c5b5cec945c77b304b420cc7aa5c49ae42e05
treedf035205722fc1d9203ec8e2ded2114f4083e7fd
parentbb6af9902dd3a44f090ee50d80e53a2bb01ec0f4
parent0f04a5a93f846d6f2d528ab6ae0c9e37d701e438
resolve merge conflicts of 3964c51bf2 to nyc-dev
am: 0f04a5a93f

Change-Id: I5bb82c0b56e43903d10304007bc17165be3c23f9