tree 3aaf3cc3265de06adaf37dc7321ce91009a8a6bd
parent 0f98ddaa0107e2bbb51c0c470db852485b25d9bd
parent d013bcea9713d178627cc1d3e8a0f291ccbcd293
author TreeHugger Robot <treehugger-gerrit@google.com> 1498016742 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498016750 +0000

Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev

* changes:
  Don't add FillEventHistory events to the wrong session.
  Fixed how FillEventHistory is reset and clarified javadoc.