diff options
| author | Chris Tate <ctate@android.com> | 2016-05-26 01:25:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 01:25:18 +0000 |
| commit | 8941b48ce27843b0d810f034bfd31fd28ff9a874 (patch) | |
| tree | 53e27b9263e9d8641cea98ff5eb06f6463842f5f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2f24635866e84ec0cf6c805b93b04d4756e53cf2 (diff) | |
| parent | fd752502a684268d526dd0743bd7a17bc277cd2b (diff) | |
Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 am: 84dd33d8e5
am: fd752502a6
* commit 'fd752502a684268d526dd0743bd7a17bc277cd2b':
Backport of backup transport whitelist
Change-Id: I92a155ef2fd5293273d6c1d1e254b52e52087e31
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions