| commit | 1724a20e14a11f964dc922cdaef2646302961cd1 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jun 02 06:54:20 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Sun Jun 02 06:54:20 2019 -0700 |
| tree | c1d8ec3fd7ebabe02fd9404592b1111906bb1cec | |
| parent | 57a1500698513593e7725f0dc346219f2839daba [diff] | |
| parent | 0beb862ba074ca3c03f36b6dcf11694a1c69fb18 [diff] |
resolve merge conflicts of aef843f97038df818be789ae3b7fa671920c2fa0 to qt-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. BUG: 133225687 am: 0beb862ba0 Change-Id: Ic99ffd7cd2ef3291211738b1d1e787b738eb4c9f