| commit | b1e69a1f6d59ca85381bc63b5e94c18793c5a170 | [log] [tgz] |
|---|---|---|
| author | Tony Mak <tonymak@google.com> | Mon Jun 13 12:39:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 13 12:39:10 2016 +0000 |
| tree | 6c26422274cb04131427fac0eedbb0b88d23295e | |
| parent | a0a6f5468746b85b4627c41b0b48577f280575bc [diff] | |
| parent | 047773fe9f6fa0a1c7bd98d44f6f703bae3840b9 [diff] |
Merge \\"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\\" into nyc-dev am: becebcbc6d am: 047773fe9f Change-Id: I8d62066d8d4d5f5fc3f84bdf82fdc7936dc013b7