diff options
| author | 2016-06-13 12:22:45 +0000 | |
|---|---|---|
| committer | 2016-06-13 12:22:47 +0000 | |
| commit | becebcbc6deea36326d99fa10e20066949a6cd59 (patch) | |
| tree | a077d815661aad2f7d9887ab4847cb4e5d06359f /libs/androidfw/AssetManager.cpp | |
| parent | 82f2df610894c6e423311467943a37330dbaa66b (diff) | |
| parent | 751c00e3c0d7dab1e9a3a34d8a00e5095982859d (diff) | |
Merge "Use startActivityDismissingKeyguard to show vpn setting page in keyguard" into nyc-dev
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions