commit | fcd28e716cee91201f4b96fffea97de1b8c69eae | [log] [tgz] |
---|---|---|
author | Joel Galenson <jgalenson@google.com> | Wed May 08 15:23:22 2019 -0700 |
committer | Joel Galenson <jgalenson@google.com> | Wed May 08 15:23:22 2019 -0700 |
tree | 71e8d87f19ef41b877faa9d758ac4f2b2347d255 | |
parent | 53e1a92d242bd92065f58a7c1fbdb5cec7a260c5 [diff] | |
parent | 2be56add2d0c7d70c2e122d8fd0eeb817e6aa7b3 [diff] |
resolve merge conflicts of 2be56add2d0c7d70c2e122d8fd0eeb817e6aa7b3 to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I1711d07cae7b30004c67829db3560de7cd546dd3