| commit | aed7e5b79bdabbbad1c2a9a7fb05809e91b80baa | [log] [tgz] |
|---|---|---|
| author | Suren Baghdasaryan <surenb@google.com> | Tue May 21 14:22:20 2019 -0700 |
| committer | Suren Baghdasaryan <surenb@google.com> | Tue May 21 14:22:20 2019 -0700 |
| tree | 353f48ca2af86ea3ab5cd45f2181378c98f933b6 | |
| parent | b56cd2ebe990740b9b8e89200a2fbb75a0266556 [diff] | |
| parent | f3fe9a73d1625dd673c1d82502bbff6495866ebd [diff] |
resolve merge conflicts of 9b77c0ba32b35e71ef0dc918b23fc7a438044c1f to qt-dev-plus-aosp Bug: None Test: I solemnly swear I tested this conflict resolution. Change-Id: I41222988279c73a22f015f26c4d6e88fbfbb009f