tree 84747eaea2ced4213b410452a60892c9ccf1f7fa
parent f88194161447217a49919e36329cb820023deb82
parent e3aff37dc7e02cd2104767dac8f115ec1bfd3cd4
author Carmen Jackson <carmenjackson@google.com> 1565683985 -0700
committer android-build-merger <android-build-merger@google.com> 1565683985 -0700

Merge "Add suspend_resume trace events to the atrace 'freq' category."
am: e3aff37dc7

Change-Id: I5ded43fc89c1d3720012c564cabbc6ba254a2f01