tree fda1861c00e64ab4d7b0ce44a7c65961c8f4762d
parent 7b91c55b3ff4857e904a11a0a67fcc86a32868b4
parent 978a1ed5aa2752cd36ff51df91d2d2d8be2171d9
author Adam Lesinski <adamlesinski@google.com> 1425334977 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1425334978 +0000

Merge "Add generic "INTERACTION" event type to UsageStatsManager"