3455f8ee9d
Merge commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669' into eclair-plus-aosp * commit 'bcef9ac35da08b9f7f8a4728af94c23a7a010669': add basic time stats for surfaces lock time