diff options
| author | John Huang <jsh@google.com> | 2013-11-13 12:07:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 12:07:10 -0800 |
| commit | 299e011ebd7ce9593c203ecfc9f5eed45360a5ed (patch) | |
| tree | 2ed2dcbb00129b012de014cec940d300a139ebc5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c95bfc4dc8eb453999dedbb9a437713bd41eacb4 (diff) | |
| parent | 54ca906604c2ff0a58274e5d1b66cdba4df8c3d8 (diff) | |
am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
* commit '54ca906604c2ff0a58274e5d1b66cdba4df8c3d8':
Get rid of a race in NsdService in stopResolveService and getAddrInfo
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions