| commit | 2e61de34f9c83e800f7124e4e6d1785bda595075 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue Jun 18 18:42:22 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 18 18:42:22 2019 +0000 |
| tree | d28c9c8754434e3e91411cc536a16d4db5e3f964 | |
| parent | 7a5652ffdf491d63ed1c2f3b0d7d771781f05515 [diff] | |
| parent | a8ff15fd9a382561a837ec96053b66c3f33912b8 [diff] |
Merge "[automerger skipped] Merge "Move off ZipString and over to std::string/std::string_view as appropriate." am: 93903b798d am: 4e696020ff -s ours am skip reason: change_id Ib46761d89772d3a3c655a39df573fd305c117d19 with SHA1 78de4f999d is in history" into qt-dev-plus-aosp