diff options
| author | Chong Zhang <chz@google.com> | 2016-08-15 19:34:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-15 19:34:59 +0000 |
| commit | 8f3a53381d139bc9e663bae8a6540baa4e4efa9b (patch) | |
| tree | 23f578556416174f73eebeadfe42049435fb7129 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b7973bcf0697d1dd831dd53f6eae0f3ddf51380c (diff) | |
| parent | 98ab9ba8f38451849948902a9a4465d52d0450cc (diff) | |
Merge "Allow performShowLocked when transition animation started" into nyc-mr1-dev am: 1fb9466c1d am: 2261bb362b
am: 98ab9ba8f3
Change-Id: If3a2c6ef7755248035b11dda9fe4ac764b41ac2f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions