diff options
| author | Erik Kline <ek@google.com> | 2017-08-09 22:36:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-09 22:36:36 +0000 |
| commit | 8d5504732dd2bdbc7b4c7f4eecdf9efc14beb961 (patch) | |
| tree | e2a9269ceebc7b22992003c2f28f8fd6ed80f2ce /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4235fe798b1d233121d7670817278ef99bff3be0 (diff) | |
| parent | 63e06b99f7a90a2f4a563110cafc13183b710474 (diff) | |
Merge "Always note the state of RNDIS from USB broadcasts." am: d27af8af62 am: 47f2cf5144 am: 89384db942 -s ours
am: 63e06b99f7 -s ours
Change-Id: I155f9de5db589e2d409f9d01bcb43402c59317e5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions