tree 38644fefb8b14a389b2a8259de9f9e9f97f5d55a
parent 32f0d37c82af75ffe6e8cc22917335d576c31ea7
parent 04c21cf5544e998da99f739466c679c4e1819a8d
author Jin Qian <jinqian@google.com> 1510190445 +0000
committer android-build-merger <android-build-merger@google.com> 1510190445 +0000

Merge "Fix buffer overflow in blk_alloc_to_base_fs"
am: 04c21cf554

Change-Id: Ia32c2fbd895859f722c1cfdeac04d687c64c10f0