| commit | 9453ea8ba9f46ebd7bb3ffb7d1feaa20908e8cc7 | [log] [tgz] |
|---|---|---|
| author | Todd Kjos <tkjos@google.com> | Tue Sep 13 12:40:32 2016 -0700 |
| committer | Todd Kjos <tkjos@google.com> | Tue Sep 13 12:40:32 2016 -0700 |
| tree | 6745841d523095548595ab767ec6893814040914 | |
| parent | afd59e2f1126fd5ce7b8a7036be9e2696437ba85 [diff] | |
| parent | c6937f2621fa605a8137ca753183e199c3352cd5 [diff] |
resolve merge conflicts of c6937f2 to nyc-mr1-dev-plus-aosp Change-Id: I82638b0dab5e1b5117f4ed4752fd2cbdaf8c47b1