diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-06-29 11:38:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-29 11:38:48 +0000 |
| commit | ba2afd812cb644d394b2193c2fcd2feca6864cfc (patch) | |
| tree | c101441c7528104f87f8bde3ca2acf830815d092 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 17b6e759e9927cab5781a9f2f7153fbb61787cc0 (diff) | |
| parent | f1fff7976937d92bc7e0014d54cb071a509975dc (diff) | |
am f1fff797: Merge "Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService." into mnc-dev
* commit 'f1fff7976937d92bc7e0014d54cb071a509975dc':
Add flag FLAG_ACTIVITY_RESET_TASK_IF_NEEDED in LauncherAppsService.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions