Skip to content
Commit 5f9c1b34 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Merge \"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\" into nyc-dev 

am: becebcbc

Change-Id: I8882135a4c1f8e385d6cef563f01913350260013
parents 6e6b0ce1 becebcbc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment