tree 262b051b0da331574492abfb6f9dfbb7e82ecc9a
parent 9853ce92043ba4d5fe23f013920743fcf73e1874
parent 3e0fe963314c92547e557a654b9ac64ad62b1201
author Treehugger Robot <treehugger-gerrit@google.com> 1615229301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615229301 +0000

[automerger skipped] Merge "CEC: Move finishWithCallback method to FeatureAction" am: 26c490456d am: c44fd1eead am: 3e0fe96331 -s ours

am skip reason: Change-Id Idd30ec162136c8b32e8cee1181c6e3e733aa9966 with SHA-1 b686aa5fd9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I869d462caac0a1145253bd63972711649c74b40d