| commit | 2d80eb4425d611fd7c0814236cf79ccb68bf5316 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Fri Nov 09 18:39:28 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 09 18:39:28 2018 +0000 |
| tree | 519d3778380f482fe6255f081bdc4a5de6d6265c | |
| parent | 7a6f5c4b016b3b339d4a013ec33458d598947065 [diff] | |
| parent | b2f48af230e509ac8012612fe0262d7afc3659b0 [diff] |
Merge "Revert "resolve merge conflicts of 0cc0d229d0f590fe84c1b7aa8cc8fbf188d8a787 to pi-dev-plus-aosp"" into pi-dev-plus-aosp