| commit | 494eba68b8ec1267b9181a6e6894901d3519b9ec | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Nov 28 12:10:10 2016 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Mon Nov 28 12:22:45 2016 -0800 |
| tree | af595adc51413395486a6c4db6d30430a651dd48 | |
| parent | 51be1d937c1c806fda801b4c0b36bf2479b91ece [diff] | |
| parent | 03c972ef16a6f0533604dbd542ba2e6886293585 [diff] |
resolve merge conflicts of 03c972e to nyc-mr1-dev-plus-aosp Change-Id: Iaa68b78b2f620402c6cc4b102ccac79497db9600