tree 4843f5671485d633c303cd446f292f634dc62756
parent ba90242223de57d7de9bf71c5fa2b29cafcdd389
parent ca5e6a17a5847987d7f6c9f06a8e577be42fb115
author Treehugger Robot <treehugger-gerrit@google.com> 1581988584 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> 1581988584 +0000

Merge "Fixed redefined-outer-name lint warning as follow up to aosp/1219749." am: aebb7d133a am: ca5e6a17a5

Change-Id: I74b6167e2144b776fcc8267678463190a0217111