tree 6abdbd01c9b9fb90d4ebb163f703a8ca294d7f5e
parent 2ff7b3e5222deffadbb6b557ab015f753454f6ad
parent 5302b62103affaba0d82eae9eee33d2dd7dd2bed
author Svetoslav Ganov <svetoslavganov@google.com> 1512701087 +0000
committer android-build-merger <android-build-merger@google.com> 1512701087 +0000

Merge "Use correct user id for permission check for instant foreground service" am: b76e984536 am: 2ba5aba394
am: 5302b62103

Change-Id: I127b3eb522a7bfe18ae8e8932858b99406c67ade