tree 661be10734e291d9189418c993c0679ae90ba100
parent f7fad8df8df5b161b39f3f16a1e0bc08e25c5e83
parent 7a251c3debf313f9cc34336b81749ee9dabb8eaf
author Wei Wang <wvw@google.com> 1524189572 -0700
committer android-build-merger <android-build-merger@google.com> 1524189572 -0700

Merge "atrace.rc: make gfx tracing point available for non-root" into pi-dev am: e63a117eb7
am: 7a251c3deb

Change-Id: Ide9e0492853817a2601245ccd86c12502200b4a2