tree 949a36bac8c32cda6e1afb24d75868d3a10ad32c
parent a7c9d2e980c717a36c9fb8cc2edde7f9f9e5405d
parent b2140e1246226fe387826b558be659e6e5796f94
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576809071 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576809071 +0000

Merge "Fix error checking in append_string" am: e2e2b2d3d3 am: 33e2002540 am: b2140e1246

Change-Id: I07dabf70064881875b5c6fd7522e9334dac3d8d9