| commit | 9426e28727f85f78761f8c05bc8d6570232c6971 | [log] [tgz] |
|---|---|---|
| author | Roland Levillain <rpl@google.com> | Thu Oct 18 13:00:11 2018 +0100 |
| committer | Roland Levillain <rpl@google.com> | Thu Oct 18 14:18:17 2018 +0100 |
| tree | 56b2ab137b8e841289303d600bbfec6861e8d152 | |
| parent | bae081d20264d8df21854f27e618a1cb2a5e50fa [diff] | |
| parent | acbcff9e7dcaacd1db833aa9923897ffa734878f [diff] |
resolve merge conflicts of acbcff9e7dcaacd1db833aa9923897ffa734878f to pi-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Bug: 117349311 Change-Id: I1d07e5d6e749bd96cf322dd77422d6401233f081