tree 05453522ef166f9cf49d443fb767024cdffba9ea
parent 53ad95ded82391507a7c516ff317385becdb2025
parent 15946ecc29e1ddfb6a45e2b4db85381141acd769
author Elliott Hughes <enh@google.com> 1516657147 +0000
committer android-build-merger <android-build-merger@google.com> 1516657147 +0000

Merge "Avoid possible buffer overflow." am: 5b6c4c4612 am: 9f461fcb2b
am: 15946ecc29

Change-Id: I945904ff338b30296a1cae508160689758bf55e2