tree 21ceaddb1ebc42b387c819c1dfc800eff9a1fc55
parent b1e0282aa3f2646702a109b50190c956b7fc838d
parent e72e8b15285bdd4f4817e32a4fb8cb09cad01901
author Chris Wren <cwren@android.com> 1505419593 +0000
committer android-build-merger <android-build-merger@google.com> 1505419593 +0000

Merge "also log user-initiated notification collapse events" into oc-mr1-dev
am: e72e8b1528

Change-Id: I7a65e5ac332cb5f9d0b6cad8cb346132dfe74949