| commit | 959d02c19b641fbd0ce80bb4cd90714a397b0766 | [log] [tgz] |
|---|---|---|
| author | Bjoern Johansson <bjoernj@google.com> | Tue Feb 14 18:24:01 2017 -0800 |
| committer | Bjoern Johansson <bjoernj@google.com> | Tue Feb 14 18:24:01 2017 -0800 |
| tree | 27a4ef8ad17e7291079f407f2ecfce5ae7568619 | |
| parent | 266d07f3cb10cca4297307e2be6896017c95d669 [diff] | |
| parent | dfc0ec200f1b4afd96e415f878d64d3a9f726052 [diff] |
resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev Change-Id: Ie0b71a29966154a8590b3e4749f7713acaab0325