diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-14 22:47:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-14 22:47:44 +0000 |
commit | e2e8301083173136bccaaf8ddbbc6ebeaf68d5b9 (patch) | |
tree | ebd855c76385a897c34120a3f56b139c96f48cb5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 240a70f1e58af96154c05f3f79023f6b7c413291 (diff) | |
parent | 215883ea3d31465d59adf0ef09e4a497660b9754 (diff) |
Merge "Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev am: 21f3489653 am: b7aade045d" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions