[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
gugelfrei
Mengjie Xie 5 years ago committed by android-build-merger
commit 311ee8ccb0

Diff Content Not Available