tree 4c7f9ec23c3e9debfbd89bfa068967e4599b512a
parent 2117af0cefc50b0d8359fbfbe4b0b0015c71bdb2
parent 438a656bb374e5840f144baf28854a4c67928c65
author Mengjie Xie <mengjie.xie@mediatek.com> 1572628742 -0700
committer android-build-merger <android-build-merger@google.com> 1572628742 -0700

[automerger skipped] mTraits is used without been locked am: e32a1d7c90
am: 438a656bb3 -s ours
am skip reason: change_id I96870027fd171fea15957b292c4898043262d9cf with SHA1 51f5abaff8 is in history

Change-Id: I4f473f1796d865ee5db663e1c707a226b9beb47f