diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-06 17:24:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 17:24:31 +0000 |
| commit | a1a9644529292e531d5dbccdaeac1399544aff1a (patch) | |
| tree | 75300101628c9d1c24b589b4eef7ce3f8bdeb2ea /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cb42d9e3ab940dd1d585928acc9f77e3ae1ee4db (diff) | |
| parent | 74423ccf95c9d09a52a6a6fbe8ccedb1be88eda9 (diff) | |
am 74423ccf: am aacc7978: am 41dfffb3: am db6a6a21: am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev
* commit '74423ccf95c9d09a52a6a6fbe8ccedb1be88eda9':
Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions