tree 5e840c801f0af06f66856ba30c70a280bfdcbb57
parent f48fba4da88cfde6166723638914856fc60908b4
parent 5811f47755c7c6663ee57b9a1f5c91c78290c02c
author Felipe Leme <felipeal@google.com> 1570653229 -0700
committer android-build-merger <android-build-merger@google.com> 1570653229 -0700

Merge "(Minor) fix on ActivityManagerService.LocalService.getCurrentUserId()" into qt-qpr1-dev
am: 5811f47755

Change-Id: I9cc8522ee163b3567ee6a5c27cda2c2c70070015