diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-08-21 03:54:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-21 03:54:02 +0000 |
| commit | 42849cb36995e9675b546c1345f39ab37b977f41 (patch) | |
| tree | 5b130e5d9a3afc20a4b2817adb43ddad673ced1d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 54838dd2c63df814b7de333b745c36f307621d1a (diff) | |
| parent | 94bee7941bc10ec52c00c95137563fa660924630 (diff) | |
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev am: 322a336e3f -s ours
am: 94bee7941b -s ours
Change-Id: I3bbeb7e326b3b009634e862248d961a07116796f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions