diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-06-07 21:47:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 21:47:47 +0000 |
| commit | aa3142551faa2916774f3e7ef4c68cb7718e280b (patch) | |
| tree | e335babc02ee1f35e56c9fd60b7dcfac6b917e8a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3f8c335ec893eddcb49f892e1b2d8eeb06aae940 (diff) | |
| parent | c7d4074aef4aee0d7ec7e2d1413cf370f6756291 (diff) | |
resolve merge conflicts of ae7641a to nyc-dev-plus-aosp
am: c7d4074aef
* commit 'c7d4074aef4aee0d7ec7e2d1413cf370f6756291':
Delay handleEnable() until Bluetooth state is OFF
Change-Id: Iac013f281d63fe627f4d216f187619adad2d2ccc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions