[automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev am: 8e7794e97b -s ours
am:2c8ab195b0-s ours am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA157f207b1c7is in history Change-Id: Id3eca996369f20b684f2d3d0436a79288193c7b0
This commit is contained in: