tree b191a6b41229ce9867842fc60e5bd9dae1e96f54
parent b491496fc3a16e0eec6791efc9a5c504e179031b
parent 7b67d2851806a6c4d66953564b5d2c052bdc8f9c
author Elliott Hughes <enh@google.com> 1558635816 -0700
committer android-build-merger <android-build-merger@google.com> 1558635816 -0700

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

Change-Id: Idbc570cc79fd3d620e2f3544b90cffb43139b6bc