diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-07-18 00:36:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-18 00:36:42 +0000 |
| commit | b1ad609c47a3faa365efd2a1083295f27e77fac3 (patch) | |
| tree | daa1248e91b9fad6d7ecef297fcb57062c6ff793 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d55592a15cd9834a4409cf9455053a89d3ffdb9a (diff) | |
| parent | 658a096f85112a89f8fb8ac3cb4535cab189f84e (diff) | |
am 658a096f: am 40bd4ef6: am 49de87a1: am 80a3fbf4: am c9eb398a: Merge "Clear identity when killing media provider." into mnc-dev
* commit '658a096f85112a89f8fb8ac3cb4535cab189f84e':
Clear identity when killing media provider.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions