tree 892c4a97097e9f25829ebd44d3ee57980fab456d
parent 8ad96a1f53340811d9a8762a1e53fe48052826d7
parent 503bc647acf1aa8d7fd74d5178f98a5fb5fc73a6
author Xin Li <delphij@google.com> 1572157656 -0700
committer android-build-merger <android-build-merger@google.com> 1572157656 -0700

[automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: 503bc647ac -s ours
am skip reason: change_id Idcc41fbea7b61009be4b478fdd4ebebdf5b22586 with SHA1 62696be94d is in history

Change-Id: Iccc58e23d3a956f4f7584afde9137aef9f2c606a