diff options
| author | Aaron Whyte <awhyte@google.com> | 2014-04-16 23:56:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-16 23:56:07 +0000 |
| commit | 8aa68921a577e1b665fe61cb40d3c929054a0a94 (patch) | |
| tree | c827d9b0e4b759c7ff969c00f8257d3f3306c04e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3d295988f2d7011db3cec69ba0d80736a568ab15 (diff) | |
| parent | ee5d512d624c15fa0c7e179ace24c7055a9f539d (diff) | |
am ee5d512d: am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
* commit 'ee5d512d624c15fa0c7e179ace24c7055a9f539d':
Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions