diff options
| author | Matthew Williams <mjwilliams@google.com> | 2015-10-20 23:56:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 23:56:28 +0000 |
| commit | 9e7d8c714d4730952edffbca5adf2ff57856cf40 (patch) | |
| tree | cc91e210bdba419e8176ac23064ba09be1d1fdd6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 668895acc40274abddf023885712a591ded6a661 (diff) | |
| parent | f012481a4442cb0289a7d77444c59d7f0041eb18 (diff) | |
Merge "DO NOT MERGE Race condition in JobServiceContext" into mnc-dr-dev am: cf43b5523f am: 07de80bd87 am: 4e18ec7343
am: f012481a44 -s ours
* commit 'f012481a4442cb0289a7d77444c59d7f0041eb18':
DO NOT MERGE Race condition in JobServiceContext
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions