diff options
| author | Chris Tate <ctate@android.com> | 2016-05-26 00:51:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-26 00:51:20 +0000 |
| commit | fd752502a684268d526dd0743bd7a17bc277cd2b (patch) | |
| tree | 6a0872d2cdb6eb1b33b8ce1227221883745466e0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 701438fbf295101ed25b65f96cec0cc022d4029a (diff) | |
| parent | 84dd33d8e54bf175fe4045999202cc92ef6fb948 (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
* commit '84dd33d8e54bf175fe4045999202cc92ef6fb948':
Backport of backup transport whitelist
Change-Id: I1ed0336ab110d291d92df781beb4cac272c1bc63
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions