65e301c09b
Merge commit 'e441dcbb4ed197cf248420308f5eaa935333651e' into eclair-plus-aosp * commit 'e441dcbb4ed197cf248420308f5eaa935333651e': Performance measurement framework: