tree 4fffe2e5a55fe88d08fdc5393c7882218433bb39
parent 3d3c626e111293390f73a1a933e2f2bb5a4649eb
parent 33bea3ea1e418f23e1152fadbec53ef7ffad390b
author Tyler Gunn <tgunn@google.com> 1539278335 -0700
committer android-build-merger <android-build-merger@google.com> 1539278335 -0700

Merge "Correct grammar for "unable to merge" error message."
am: 33bea3ea1e

Change-Id: I82c52c7b3f16534b1ac920dd040db8b5184419dc