| commit | 8b21d8e1f1c85fdc0f81a2443fcdd6912b540d72 | [log] [tgz] |
|---|---|---|
| author | Xi Han <xih@google.com> | Fri Jun 01 15:55:42 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 01 15:55:42 2018 +0000 |
| tree | f3c1886bfd40d4e03906147a4bf2118ea1053ef5 | |
| parent | 15bc180608cffe6b040eac3a0da9b7d5187b93f9 [diff] | |
| parent | 410cfd83c7a0a83a923d3e3ae5ead230a407fe05 [diff] |
Merge "resolve merge conflicts of b1014fe17b5f4e37444a5870fc34b12f5bac3f99 to pi-dev-plus-aosp" into pi-dev-plus-aosp