tree 2ff8287fa9d16b8367ed9138f232f75a6ad44e44
parent 160b40f7f409d44c1478265888ac85e190695578
parent 54062604cc4f63f3142c0818869d7dc823fc9792
author Janis Danisevskis <jdanis@google.com> 1561688191 -0700
committer android-build-merger <android-build-merger@google.com> 1561688191 -0700

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

Change-Id: Iaa2117fd67fca055b49992ffb115e7a967a7fc60