tree 2ff8287fa9d16b8367ed9138f232f75a6ad44e44
parent 4f4501ec2f86c550e7ea9429cf83d3b7c7fe3dd7
parent cad82bcad389c4354f676e350bb8a7915392708a
author Janis Danisevskis <jdanis@google.com> 1561686248 -0700
committer android-build-merger <android-build-merger@google.com> 1561686248 -0700

[automerger skipped] Gatekeeper: revised buffer handling am: be4a8f4eeb
am: cad82bcad3 -s ours
am skip reason: change_id Iad911bafb939fdcec1e3d19f6d1af0fe98cc2080 with SHA1 4f4501ec2f is in history

Change-Id: I51c584d6951bd36f3fbad080c931326bb31882bb