| commit | dd18bb37c6121c733993ca1e545451d3391f3095 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Thu Dec 21 14:09:05 2017 -0800 |
| committer | Clay Murphy <claym@google.com> | Thu Dec 21 14:09:05 2017 -0800 |
| tree | 40880ae4df1cc4e241dacde4c6b4ef2c0403322e | |
| parent | 93c0c1d0b9a804492f4b08421d40c94528fa5f6c [diff] | |
| parent | 4d044d6bbf8225eef3fe10e440b78b55cc09682d [diff] |
resolve merge conflicts of 4d044d6bbf8225eef3fe10e440b78b55cc09682d to nougat-mr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: Ic97f35757d2129f4b0e4ff09e1b22faca3f5698c