tree 413b96b011583bfeec256c4245cb73db494dfc51
parent aeb33eb0a827ee8688c73594f05a478d21fa0ef2
parent 11c5ff0399c3c978d9e654a1ab668ba6dfbf920d
author Kenny Guy <kennyguy@google.com> 1489494060 +0000
committer android-build-merger <android-build-merger@google.com> 1489494060 +0000

Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am: 2df7f9f9c0 am: c5d86736d3 am: 00b77edec0
am: 11c5ff0399

Change-Id: I649c06ea01b23db5668fa0694528cffd823b8d7b