tree 8524e0728eefde90ab0b0526a2286a2c9927fc9f
parent c11aa12eb8850e402003930e1695c8ac7272b0d3
parent 5354bc454ddcd995c46a05fd7a1b3ec305547a10
author Sidath Senanayake <sidaths@google.com> 1562111285 -0700
committer android-build-merger <android-build-merger@google.com> 1562111285 -0700

[automerger skipped] Merge "Update filesystem permissions for gpu frequency tracepoints" into qt-dev am: 8586eb6409 am: abdfcd325f -s ours
am: 5354bc454d -s ours
am skip reason: change_id If7e43bcf95e0f2162af618b20d3c26aad3264f97 with SHA1 05b22d863e is in history

Change-Id: Icc4fa6e4819a30e50ba6b316aac7b1c4d40e8667