| commit | 609babb1b22abc585dd0b6451883e95fab06d9ca | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Mon Nov 13 20:17:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 13 20:17:12 2017 +0000 |
| tree | b053b5f15ee7d89f83af92441c8146c61e555897 | |
| parent | 63ca96305e389e4504ab8d89111dc8719d00161f [diff] | |
| parent | 9c59bc9c37dab612c9d8fda98970c317da1963a3 [diff] |
resolve merge conflicts of 5c4fbd2817 to oc-mr1-dev-plus-aosp am: 9c59bc9c37 Change-Id: I2674d0e4b49082d9d068575ce1c5e7b53a5ea01e