| commit | 05394caefed04b9cb43d5ef99f5a564bfb657669 | [log] [tgz] |
|---|---|---|
| author | Shuo Qian <shuoq@google.com> | Thu Nov 08 01:41:15 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 08 01:41:15 2018 +0000 |
| tree | db32d7fead321dd4619c1355ef3817d205d2ff7f | |
| parent | c2dcd92c33ad1e6b29ade9dd756f7d44b257ddfc [diff] | |
| parent | 8d391c858092e12e500298ad0c588a9d49ad55f9 [diff] |
Merge "resolve merge conflicts of 61444e09ff46c30f6728954323765562eb6fd0cf to pi-dev-plus-aosp" into pi-dev-plus-aosp