diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-08 00:52:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-08 00:52:25 +0000 |
| commit | 62a03f79c91cb53264eed8e41b34c03163b67d68 (patch) | |
| tree | 13765863537022901d5bfaec4106d7dacb121dbe /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5711c09fc7925dce3deb0e5f740eed922d91f1bb (diff) | |
| parent | c0b6cf03a919451d611cb6c13c466a27ad9f3f94 (diff) | |
Merge changes from topic 'am-686aabc46c2945ceb8bf69ea0c8d1dc7' into oc-mr1-dev-plus-aosp
* changes:
Merge "Reset wait for transition state to false when recents goes invisible" into oc-dr1-dev am: 673e3c41ec am: 5f862061ae
Merge "Revert "Revert "Fixing occasional jump when launching certain apps from Recents.""" into oc-dr1-dev am: c7d24aed82 am: 44bdd5cce4
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions