diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-13 12:39:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-13 12:39:40 +0000 |
| commit | 72f255c0c933122d6b3683122a940015e1d198a0 (patch) | |
| tree | 6c26422274cb04131427fac0eedbb0b88d23295e /rs/java/android/renderscript/RenderScript.java | |
| parent | b1e69a1f6d59ca85381bc63b5e94c18793c5a170 (diff) | |
| parent | d7bf56cace938a2e5d413f4e89a7c90f3e543e27 (diff) | |
Merge "Merge \\"Use startActivityDismissingKeyguard to show vpn setting page in keyguard\\" into nyc-dev am: becebcbc6d am: 5f9c1b342f" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions