diff options
| author | Craig Mautner <cmautner@google.com> | 2014-06-14 01:17:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-14 01:17:17 +0000 |
| commit | bbca40a0696e1f0728ac15204eac00a0c26e8eb2 (patch) | |
| tree | bb8fd67a39b85282d7d37f0cf07468688cefaaa8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71320072e1b94feb8c1368360e4856a5fa724ddf (diff) | |
| parent | 916cd9770ce865bad98f15a68be74f3aa607e727 (diff) | |
am 916cd977: (-s ours) am 6335fbcb: Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
* commit '916cd9770ce865bad98f15a68be74f3aa607e727':
Revert "Revert "Close ActivityView and ActivityContainer cleanly.""
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions