diff options
| author | Mahaver Chopra <mahaver@google.com> | 2016-07-13 12:27:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-13 12:27:01 +0000 |
| commit | 695a1c50a274c4ba423d910d3d4167a7493a6ea1 (patch) | |
| tree | c201e51bd44750f84696cc3a59b6f13910f00008 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b4d4ce31ab92ddaf1e8ef337b5ba73ea852a2ac9 (diff) | |
| parent | 3d9805d50281882b4420ee2d4ede8a8bdd94d455 (diff) | |
Merge "Added UM.DISALLOW_OEM_UNLOCK, Removed Global.OEM_UNLOCK_DISALLOWED." into nyc-mr1-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions