tree 9bb088023c923b83c6f8e6ce4f6b4c75ba225774
parent 9400c41dac67cd9998f17ba2a0a321270c52428e
parent d112e6391b84b55d24eb38e0f20cb478abf52023
author Matthew Fritze <mfritze@google.com> 1501100065 +0000
committer android-build-merger <android-build-merger@google.com> 1501100065 +0000

Merge "Add metrics event for trampoline activity" into oc-dr1-dev am: 44f7badb73
am: d112e6391b

Change-Id: Ic13893b4cca32a4e014fc8fb96370ee63234a188