| commit | cdfcc5f152f2ebaf3fbdf6ef833e097f8f38d758 | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Sun Mar 12 20:00:00 2017 -0700 |
| committer | Aaron Holden <aaronholden@google.com> | Sun Mar 12 20:00:00 2017 -0700 |
| tree | 85e48f710717adbe51da2834ff5d399422b9bbfd | |
| parent | 0967c5adc6194c5d891d0510102e13173645a731 [diff] | |
| parent | 8f1d6c7bdaf1c47343f34b9c44ac1cd2a82d26fb [diff] |
resolve merge conflicts of 8f1d6c7bda to nougat-mr1-cts-dev Change-Id: Ic704945b694b9315506f677f9804ecfd140ee4b6