tree 0a57a6bf045bc85a7dd194ff203c375660249f83
parent a8c068f7231e558899c49c987240df8685807b6b
parent 57132a15137f9d43a276cbadc93dbdd76ef12e06
author Brad Ebinger <breadley@google.com> 1491243948 +0000
committer android-build-merger <android-build-merger@google.com> 1491243948 +0000

Merge "Move CALL_PRIVILEGED/EMERGENCY to @SystemApi" into oc-dev
am: 57132a1513

Change-Id: Ic29e989b13f2a9d4d53b403f3bdc1b1c46145e45