| commit | 515d535f16628646d0ee32d7a81cf1516de982e5 | [log] [tgz] |
|---|---|---|
| author | Torne (Richard Coles) <torne@google.com> | Mon Feb 25 18:07:23 2019 -0500 |
| committer | Torne (Richard Coles) <torne@google.com> | Mon Feb 25 18:07:23 2019 -0500 |
| tree | c906268e644b3b412831e3d23633330f33d4e294 | |
| parent | 8c3d859dca535f1a783a3e1a6b40dd6210d0663b [diff] | |
| parent | de712e371c9b081deefd539b74048817314c7c41 [diff] |
resolve merge conflicts of de712e371c9b081deefd539b74048817314c7c41 to oreo-cts-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I70da75efba7de0266111358fd529a5240ed16246