diff options
| author | Vinod Krishnan <vinodkrishnan@google.com> | 2014-06-06 00:16:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 00:16:40 +0000 |
| commit | a3d5d3b8af8eaacaf7b733ee5cccf4c36deac852 (patch) | |
| tree | 78b75d152da5ad6c9044cbd893eb3f9aba14f7d7 /rs/java/android/renderscript/RenderScript.java | |
| parent | 59b82c3eae2cd329461b7ad64bd8abee4898a90e (diff) | |
| parent | 90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2 (diff) | |
am 90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev
* commit '90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
Adding a way to stub Vpn ConfirmDialog
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions