diff options
| author | Tony Mak <tonymak@google.com> | 2016-06-13 12:34:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-13 12:34:39 +0000 |
| commit | 5f9c1b342f1309f90634b78371fffa9c311eda97 (patch) | |
| tree | 27ae2bbd3046b3ce037e69086a31cdd96e064fa2 /rs/java/android/renderscript/Script.java | |
| parent | 6e6b0ce1a611c8b6e8789259d276117a9d0e2b60 (diff) | |
| parent | becebcbc6deea36326d99fa10e20066949a6cd59 (diff) | |
Merge \"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\" into nyc-dev
am: becebcbc6d
Change-Id: I8882135a4c1f8e385d6cef563f01913350260013
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions