| commit | 4891a02bbc5070e89e3a40656ede2a94f84b70cb | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Tue Mar 06 12:21:07 2018 -0800 |
| committer | Myles Watson <mylesgw@google.com> | Tue Mar 06 23:30:18 2018 +0000 |
| tree | 789966b6ef0337ff4405b870e74048c10e334b4b | |
| parent | c76249045b9f19b564ee89290bf20823029b5beb [diff] | |
| parent | 8a28de7a8c3d36e648e90ed2fca27c88b1c576aa [diff] |
resolve merge conflicts of 8a28de7a8c3d36e648e90ed2fca27c88b1c576aa to oreo-mr1-vts-dev Test: Manually inspected the diffs. Change-Id: I185caef3e3ee6ad3678e5f9035986d74d266d186 Merged-In: Ia1ead7ff942ffa369f88f61bcaaa8e03d7973179