tree 7e15749e8b28920108a87d5a378daf81f5a78951
parent 863c8f36dd12da32f522d94cfe0d832282afda55
parent 505ed459409c180386e2b09fcb9f79bd14ec4b5a
author Elliott Hughes <enh@google.com> 1558642212 -0700
committer android-build-merger <android-build-merger@google.com> 1558642212 -0700

Merge "Move off the Next ZipString overload." am: 7b67d28518
am: 505ed45940

Change-Id: I1543b8adc9872333c5a6dbcad001cc2387877816