| commit | b79053e117349129997d206e4dbef684c4d38c6f | [log] [tgz] |
|---|---|---|
| author | JianYang Liu <jianyliu@google.com> | Mon Nov 04 17:33:57 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 04 17:33:57 2019 -0800 |
| tree | 39f49937e60929a437c5c2e16d477b65c1a98992 | |
| parent | 10b115aa4bebb3b8d3cbc663945f8dede27fd738 [diff] | |
| parent | 783972ab8278ae9a5550a1dc80cb0fc12ad68996 [diff] |
resolve merge conflicts of 0fbfe1ec3ca70fc659b94f51d00e33e39bba7292 to qt-dev am: 783972ab82 Change-Id: I2fa805f21736911ae956737e19253d099775cf27