| commit | 7a6f5c4b016b3b339d4a013ec33458d598947065 | [log] [tgz] |
|---|---|---|
| author | Selim Cinek <cinek@google.com> | Fri Nov 09 17:30:28 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 09 17:30:28 2018 +0000 |
| tree | 369f5f829f18566c05916cb201bb42e0c1921f00 | |
| parent | 41ad850c96c085afe5dec5bef1bf10ab1e9c5738 [diff] | |
| parent | 6fa357a529a57d0421df6070d425ccc684603ef0 [diff] |
Merge "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp" into pi-dev-plus-aosp