diff options
| author | Tony Mak <tonymak@google.com> | 2016-06-13 12:43:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-13 12:43:46 +0000 |
| commit | aae5f33578d60b8019fc1af98b958ef3082dca8e (patch) | |
| tree | 3ced4d279458240d25d31a6ffd38bf3c2b440282 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 33c7a4b5963407498f52bc37b450c604461bdc68 (diff) | |
| parent | b1e69a1f6d59ca85381bc63b5e94c18793c5a170 (diff) | |
Merge \\\"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\\\" into nyc-dev am: becebcbc6d am: 047773fe9f
am: b1e69a1f6d
Change-Id: I9189cadfae3b9d98685d131ccd9debbeb4b93de8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions