OSDN Git Service

resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp
authorJack Yu <jackyu@google.com>
Fri, 3 Feb 2017 01:19:39 +0000 (01:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Feb 2017 01:19:39 +0000 (01:19 +0000)
commit1350f9a1fe30e236e8824e03f160978b425ec22d
tree70c36e82763ceed6d3ee0482e40f8c7dfcc47434
parent8b7b19144d80311c638322fde7a1b1d77ab783fa
parent5c6041843d3d6c472cf85b3e5b3857593019116e
resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp
am: 5c6041843d

Change-Id: I7f0cd240b6054f57616e223f31d09a4152fe34e9