| commit | d82fbe9fa6e7abb3dc1f06c210ce53ec48ca2f7b | [log] [tgz] |
|---|---|---|
| author | George Burgess IV <gbiv@google.com> | Thu May 17 18:59:16 2018 -0700 |
| committer | George Burgess IV <gbiv@google.com> | Thu May 17 19:00:42 2018 -0700 |
| tree | 8410c9e877d17704f9de301c1b75439d071c16e7 | |
| parent | 059211abcb154e94dd538ce51a198f41c7988ea5 [diff] |
resolve merge conflicts of c6e4407afcf383e98ce543185e8d90b2b8e6fb97 to pi-dev-plus-aosp I directly applied the patch that I made for master: b4bc355453fe535a1839be80895c84ff6fb1eb7f BUG: None Test: mma Change-Id: Ibd709b6ad150008dc65c9baa9d2e5bbd8ac9239e