diff options
| author | George Mount <mount@google.com> | 2015-06-15 20:20:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 20:20:22 +0000 |
| commit | 1b1a97dceb7625ff5e766d50b93bab8d06f1dca1 (patch) | |
| tree | d5c5dd61b3916b0713fe268f645170ac7fb0d492 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7afa5bd8655a624ce16424237db3e77fe186fe61 (diff) | |
| parent | 8acb658b2aaa89891488c427f529911e8ebf23c8 (diff) | |
am 8acb658b: am c28834f7: am 8af78483: Merge "Limit shared element transition to shared elements and children." into mnc-dev
* commit '8acb658b2aaa89891488c427f529911e8ebf23c8':
Limit shared element transition to shared elements and children.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions