tree 5eaa708cef3b5a217f79005d8c3a7f9fe1b42fed
parent 924069c2aa1d3fa64969868ccdf6dc8bf54fc670
parent 23daf2656c4a1ce5871195fe51782093732b9187
author TreeHugger Robot <treehugger-gerrit@google.com> 1585574549 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1585574549 +0000

Merge changes I6f6b4d78,I874696cf into rvc-dev

* changes:
  Only send reset state annotation when needed
  Group annotations for the same atom id