| commit | 73c361b544d49aaf1424d8d30290ccaebb273be8 | [log] [tgz] |
|---|---|---|
| author | Lei Yu <jackqdyulei@google.com> | Mon Oct 29 20:33:19 2018 +0000 |
| committer | Lei Yu <jackqdyulei@google.com> | Mon Oct 29 20:35:24 2018 +0000 |
| tree | cc14783627c67f9e51ee4f167c7eed0a2ec7517f | |
| parent | e81224d80c3af797003a40f06fc7563728a0da96 [diff] |
Revert "resolve merge conflicts of 7849607a7ca9518f57fb22cca5665b88e99134c2 to pi-dev-plus-aosp" This reverts commit e81224d80c3af797003a40f06fc7563728a0da96. Reason for revert: broke pi-dev-plus-aosp Change-Id: Ib45b96216017d01b6301a558a0cd27bf1071779c Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389