tree 47e7e4aa28e9ad18a9beea08f90e3b7792698978
parent f69ef32645e95c1bb60a037e9d4e28d2012e971e
parent a74c7274069fdfa95e4f9768e14bd2ce7ed1219e
author Varun Shah <varunshah@google.com> 1555602973 -0700
committer android-build-merger <android-build-merger@google.com> 1555602973 -0700

Merge "Include calling uid proc state in CameraService reject log." into qt-dev
am: a74c727406

Change-Id: I54728c712a14658c722061325e0f547ada467303