tree 4c0a7cd9a05c60ea1bef3252d7b8cdb62d9ed881
parent 9912e86f4a536a16b91860d80ebb5ba4343e7123
parent 61926ab2de5e8a631bc95fe34569bf6a8b5a4762
author Xin Li <delphij@google.com> 1599789750 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789750 +0000

[automerger skipped] Merge Android R am: 449f373396 -s ours am: 61926ab2de -s ours

am skip reason: Change-Id Ie7a92abe3ba5e8ed52e268bc8ee6e2464663a975 with SHA-1 a20b4f3950 is in history

Original change: https://android-review.googlesource.com/c/platform/tools/apifinder/+/1422595

Change-Id: Iec1680a62200054601f996f68bfc8565eb0cfcd3