| commit | d7fb51a483de028d437f22c02d9b78fe907ee14c | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Nov 01 16:56:39 2017 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Nov 01 16:56:39 2017 -0700 |
| tree | f2c6e304e96822eafdd669e8036ab364210a6e27 | |
| parent | 1b43913b23500884420fd896812f10f7b2b7132b [diff] | |
| parent | 20d9ae5620625de37905b6797f9b8ebad4a5d62f [diff] |
resolve merge conflicts of 20d9ae562062 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I73cd9a9198ef5640a6b3dced713fcbb17563dd8b