tree a2b6f6615ca574f64202c17ef9f735ee8a15afa9
parent 131ccb00a8f62076769d38bc6d335eafa7fd7bc4
parent 8bc0aa25598950fc853287b7513b3df450a840f8
author Rob Carr <racarr@google.com> 1498138967 +0000
committer android-build-merger <android-build-merger@google.com> 1498138967 +0000

Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am: 8bc0aa2559

Change-Id: I45a7ed913929eeb8d1b6eda6855fe7976fa64a14