Merge "Store annotation info in LogEvent/FieldValue" into rvc-dev am: c0a892456b am: 4d27d3629a am: 4a59c6c367 am: 21302aae93
Change-Id: I312a0b0ab9affc9b73988f48a042bd2783afdb0e
This commit is contained in: