diff options
| author | Erik Kline <ek@google.com> | 2017-08-09 19:31:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-09 19:31:25 +0000 |
| commit | 63e06b99f7a90a2f4a563110cafc13183b710474 (patch) | |
| tree | 149b9d3f26efcd5544e7c1ccd07066b060cdb4c7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 01b6e5d1dbdd1f5bf26ed513c7b9d248936efd28 (diff) | |
| parent | 89384db9427fe970936b32f591be4c8bab79d733 (diff) | |
Merge "Always note the state of RNDIS from USB broadcasts." am: d27af8af62 am: 47f2cf5144
am: 89384db942 -s ours
Change-Id: Ia37b7c11c786832e3f2685a363fafd575d6e6b30
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions