diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-04-20 13:44:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-20 13:44:17 +0000 |
| commit | bb4665d43cb6136b56ec33e05084aee4b6c366d4 (patch) | |
| tree | 5c9e022bde4d0016e14cb36f83e30330749e885b /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cd03c6a80ac0c8e7f0a504d96f385aa04a805b41 (diff) | |
| parent | d57709442b8c691d4689910e28235c9d7df6d484 (diff) | |
Merge changes from topic 'am-3df7247558f2482ba6861f739fe61c7e'
* changes:
Merge changes from topic 'chooser' into oc-dev am: 28602c0921 am: 4d0f44d7a7
Create a valid ActivityOptions Bundle even for default animations am: b759bd3b4a am: d85e60aa46
Remove scale up animation for startActivity from RemoteViews am: 95b193fdca am: 594f401e26
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions