commit | d7bf56cace938a2e5d413f4e89a7c90f3e543e27 | [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 | 5f9c1b342f1309f90634b78371fffa9c311eda97 [diff] |
Merge \\"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\\" into nyc-dev am: becebcbc6d am: 5f9c1b342f Change-Id: Idb66b5564cf3f26788cb18878d2fc5726a4c8c8d