| commit | b77e9e9f326ca490218b5df68978e5d834cd6f6a | [log] [tgz] |
|---|---|---|
| author | JP Sugarbroad <jpsugar@google.com> | Tue Jul 25 10:32:34 2017 -0700 |
| committer | JP Sugarbroad <jpsugar@google.com> | Tue Jul 25 10:32:34 2017 -0700 |
| tree | a377f546df29e7576ebcc7e4fa69f6c48cf4ce97 | |
| parent | 6f64ed5e805fb35c3a68a999c84a0cb65ff7a70c [diff] | |
| parent | 0f98d87975ce325a2fd93f391c18cd782ad571fb [diff] |
resolve merge conflicts of 0f98d87 to oc-dr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: Id9018fe05fb7d1f15813c46557b552e3bbbb132b