| commit | cd9d4feb4cf8c337a829b1ee96831c4b28f3f1fc | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Aug 09 12:51:53 2017 -0700 |
| committer | Steven Moreland <smoreland@google.com> | Wed Aug 09 12:51:53 2017 -0700 |
| tree | 13fbc5486b50cbec762064e9068ffaa952031970 | |
| parent | 0f584697bce7987ba3cbb6cf598d9b8cde977449 [diff] | |
| parent | d94b1e6131e5bad76f3ab2f05e5e52c103da5bb2 [diff] |
resolve merge conflicts of d94b1e6 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I77c0a971cabf56524313062c202ba2362e5fb65b