tree b053b5f15ee7d89f83af92441c8146c61e555897
parent 63ca96305e389e4504ab8d89111dc8719d00161f
parent 9c59bc9c37dab612c9d8fda98970c317da1963a3
author Chih-Hung Hsieh <chh@google.com> 1510604232 +0000
committer android-build-merger <android-build-merger@google.com> 1510604232 +0000

resolve merge conflicts of 5c4fbd2817 to oc-mr1-dev-plus-aosp
am: 9c59bc9c37

Change-Id: I2674d0e4b49082d9d068575ce1c5e7b53a5ea01e