02b5a96f2a07be2a2f03b360d7fa52fbd607d12a - platform/developers/samples/android

commit: 02b5a96f2a07be2a2f03b360d7fa52fbd607d12a
[log]
author: Xin Li <[email protected]>
Sat Feb 20 14:12:30 2021 +0000
committer: Automerger Merge Worker <[email protected]>
Sat Feb 20 14:12:30 2021 +0000
tree: dc14d3d116fe072cbfd245e73567c9d2eaf42384
parent: 5d69439ec166b7272575f8bfc9b0782574c6f617 [diff]
parent: f547fbc1c839d038d61de89499d1bbeded6f5e9b [diff]

[automerger skipped] Mark ab/7061308 as merged in stage. am: ad509e0e1d -s ours am: f547fbc1c8 -s ours

am skip reason: Change-Id I0e1120aafae610027333fd7f1c995d908f6e089a with SHA-1 e581b694ac is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I17b6867153d1581f517df33a48908e9d66fb32e0

tree: dc14d3d116fe072cbfd245e73567c9d2eaf42384