| commit | 9800b8774028e7ddce02d105e1567bfe4afb1ce9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Apr 26 01:46:00 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 26 01:46:00 2018 +0000 |
| tree | 0e554366cfe4f4a167f386ce8c5148d42604796b | |
| parent | 5654e49fa22fca0ec72e51a3cb54769cf0825ec3 [diff] | |
| parent | e7696053982d26c223e5cfc3f7a41a14dc2450ab [diff] |
Merge "resolve merge conflicts of 78495e02d6c620124f9dd37bbf55c318da969e52 to pi-dev-plus-aosp" into pi-dev-plus-aosp