diff options
| author | Amith Yamasani <yamasani@google.com> | 2016-04-25 23:10:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-25 23:10:34 +0000 |
| commit | 0bdc36c14c0bc3cbfa37ab5bd971c3fb5c1420c0 (patch) | |
| tree | 9fbd0dba2b25840568a20ce8911e815cc80bb931 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9676a93e68edf442d54943c9bd27ba17655dd8ec (diff) | |
| parent | 14d6e5fd9355ca6d1496b5d2d89555586cfbf507 (diff) | |
Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev am: 1d66995
am: 14d6e5f
* commit '14d6e5fd9355ca6d1496b5d2d89555586cfbf507':
Change-Id: I26ac8e5587517e3e4a583065204d009fa34a13ac
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions