diff options
| author | Makoto Onuki <omakoto@google.com> | 2016-08-01 17:41:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-01 17:41:57 +0000 |
| commit | 9e05cb8d5457055f04d86a07aaaa0de0499e274f (patch) | |
| tree | fe2a1f1867781f799a97b13b527b1290b82465da /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e330d59c2e006403cfd37b537e1bb47f36f9e350 (diff) | |
| parent | 5faa852c5705542274a618c130ef7c98626a4e67 (diff) | |
Merge \"Revert \"LauncherApps should also throw when user is locked\"\" into nyc-mr1-dev
am: 5faa852c57
Change-Id: I85af4d9bd703a02c24a8975aaa2e348e9f4c04fe
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions