tree 2b05896c41a3a80f18ebf627e7e6412b7ea091c3
parent 4c6991b2d0635525e5715c897dcc88238aeea5a2
parent 5b6c4c46121d48fb7ff23f7e0d1dee0e23876f1c
author Elliott Hughes <enh@google.com> 1516656411 +0000
committer android-build-merger <android-build-merger@google.com> 1516656411 +0000

Merge "Avoid possible buffer overflow."
am: 5b6c4c4612

Change-Id: I3b952f06bed1713c451a24b76fb53c39c528d9bc