tree f738716c119be64491cda0eb054f0d9e82096c87
parent 0f16e51451409e70d26fbf609d45e9a95686210a
parent 03f8dcb8a4c38d11065bd323ce759c7122c11b42
author TreeHugger Robot <treehugger-gerrit@google.com> 1612989770 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1612989770 +0000

Merge changes I0e4cedbf,Idfa1b82c into sc-dev

* changes:
  Add instanceId to LAUNCHER_FOLDER_CONVERTED_TO_ICON log event.
  Fixes wrong container for LAUNCHER_ITEM_DROP_COMPLETED log event.