| commit | bd522d9d854bdb2feac0073a94ae4da6aeac8b5c | [log] [tgz] |
|---|---|---|
| author | Malcolm Chen <refuhoo@google.com> | Tue Apr 10 14:13:53 2018 -0700 |
| committer | Malcolm Chen <refuhoo@google.com> | Tue Apr 10 14:13:53 2018 -0700 |
| tree | ffa3ba5f9d8f326beca981d2d3abe163bb8451f1 | |
| parent | 9b320b15a25e6a37fee258d79011fb5d7db6f023 [diff] | |
| parent | e45b35d186595cccb035a00d6e4c2f4bee23a507 [diff] |
resolve merge conflicts of e45b35d186595cccb035a00d6e4c2f4bee23a507 to pi-dev-plus-aosp Change-Id: Ice8f3c6c64a137391d116f69ba4c32347ffea17b