diff options
| author | Phil Weaver <pweaver@google.com> | 2016-05-12 16:53:49 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-12 16:53:49 +0000 |
| commit | d56cd1fcab01b03aa6671522f0be6e69d7ec94fc (patch) | |
| tree | c6c6b509ce6a2dbcc3af74a13dab1aeb64ec82e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 94ad652c7a23d8464e2ac30a9c9de33e16431308 (diff) | |
| parent | df15e03ed062493b506f7599ff1e6aff26828485 (diff) | |
Merge "Fix a race in settings update." into nyc-dev
am: df15e03ed0
* commit 'df15e03ed062493b506f7599ff1e6aff26828485':
Fix a race in settings update.
Change-Id: I970606b21b1a5cd2d19e0f21077636e68f107c6b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions