OSDN Git Service

resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
authorBrad Ebinger <breadley@google.com>
Wed, 2 Nov 2016 17:46:43 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 2 Nov 2016 17:46:43 +0000 (17:46 +0000)
commitbaa73944e43d657af99d8d45776f5a8d1d0bfea2
tree8b1704ffa95ff932bf3972d5385a491f06cc83cf
parenta79c39d53ea03b8333ec1dc201971b9db49b5f86
parentc5eacceb3f628561b0bad9a101c577fc1832b707
resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
am: c5eacceb3f

Change-Id: I1fe6eea67081a8d35132d87c8e3e38952e110cc0