tree a5fe7ccd29b4f11a4e453b43d4f1224a091462c0
parent 2761540d28b50cd6a44c48710b64944816765d1a
parent 99bd60a9eb76b7eb91b40dc51262739112724267
author Evgenii Stepanov <eugenis@google.com> 1489561407 +0000
committer android-build-merger <android-build-merger@google.com> 1489561407 +0000

Merge "Fix heap-buffer-overflow detected by ASAN." am: 3d028f14c8 am: 591b09650b
am: 99bd60a9eb

Change-Id: I93eb4512a850b49a432573e8f1ee018f770ffcee