tree 4bca81c13d8b41adc4cb7b038e42146fae8c1cb8
parent ccd72e78ab9c5c3cf66cb5155422ea04686b72f3
parent 15f8da95f16707fc1682872bbff273dea77b3016
author Muhammad Qureshi <muhammadq@google.com> 1556666477 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1556666477 +0000

Merge changes from topic "ActivationType" into qt-dev

* changes:
  Add ActivationType to EventActivation
  Save EventActivations to disk