| commit | 2ffa005793a878f7b6616b1458d31be1a68841b5 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Fri May 10 09:39:42 2019 -0700 |
| committer | Myles Watson <mylesgw@google.com> | Fri May 10 16:52:45 2019 +0000 |
| tree | 7f787678c6a6331c6f9d4006da5c2e3834318da9 | |
| parent | 6f9b5c8332cb081abfd75211039519390595b93a [diff] | |
| parent | 7fb9e673dfdcce7ba5b41fa487586c5c7c91b6f5 [diff] |
resolve merge conflicts of 7fb9e673dfdcce7ba5b41fa487586c5c7c91b6f5 to oc-dr1-dev This is a merge conflict while reverting commit 9c0ec84c5d617a61f4d550f022705106ad1b358c Test: git diff to see that the revert was clean Bug: 79703832 Change-Id: Ic30d837b0741ff640d5978e3526734a6502275fd