tree 2b05896c41a3a80f18ebf627e7e6412b7ea091c3
parent 7a264eede95a35e336be21a8bd914c305f2cb4c7
parent 9f461fcb2bd4116c14ed54a986bee684c12d79de
author Elliott Hughes <enh@google.com> 1516656847 +0000
committer android-build-merger <android-build-merger@google.com> 1516656847 +0000

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

Change-Id: Ie47864c9f1f9bfb8a34f276672dffb073d4197b6