diff options
| author | Amith Yamasani <yamasani@google.com> | 2016-04-25 21:45:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-25 21:45:13 +0000 |
| commit | 14d6e5fd9355ca6d1496b5d2d89555586cfbf507 (patch) | |
| tree | 60bb808c30a3174585deb715d79f352e5aba713b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 86461e692e1bac8234343a6298270aa12742cb3f (diff) | |
| parent | 1d66995f47d548efe7863e88a8cc7bd2c66661a0 (diff) | |
Merge "Fix deadlock between VrManager, ActivityManager and WindowManager" into nyc-dev
am: 1d66995
* commit '1d66995f47d548efe7863e88a8cc7bd2c66661a0':
Fix deadlock between VrManager, ActivityManager and WindowManager
Change-Id: I26ea57a0a49e78e063117f71b0f6fede8b413e7c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions