OSDN Git Service

resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp am: b912c50b19
authorErik Kline <ek@google.com>
Tue, 20 Jun 2017 15:12:39 +0000 (15:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 15:12:39 +0000 (15:12 +0000)
commita411d3281f0f20bce1c021cad42d5a9e1ca10a33
tree370a44519b3b3c44a36f85f050ef87dfcaf7d078
parent5472f2b36263588d3694e1819727455c5d7a8fc2
parent0cec17209e72639b6ac836eb8c59bba6bf481253
resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp am: b912c50b19
am: 0cec17209e

Change-Id: I542e013aa19fefd3443588c9a81ee59cd669ab6f