tree ad01e11afd6ca04d5411e0d642cdfed5626b2e87
parent c2cf9a1fa91632eafeb6b939316e3adf94c65e7f
parent 7e6b6dfb3605708eee7cdfe62f873bf1091c4a26
author Steven Moreland <smoreland@google.com> 1547264022 -0800
committer android-build-merger <android-build-merger@google.com> 1547264022 -0800

[automerger skipped] getCallingSid: get calling security context am: 683b6d043d am: d7acd8a870 -s ours
am: 7e6b6dfb36 -s ours
am skip reason: change_id Ia8a4c0cb4a9c86dcc0d3b7583014237f879a3074 with SHA1 f0a7d7899e is in history

Change-Id: I310b74e061f79339b08dbfb246daa08208b49706