diff options
| author | Vinit Deshpande <vinitd@google.com> | 2014-05-20 11:50:17 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-05-20 14:59:32 -0700 |
| commit | 43cfdfd9c536782d7481522a8c9d724cb67ccb2c (patch) | |
| tree | 48368f7b57bc1111249ec1ca3a75f9f8a44e7d0c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 401b3ebfa995de296292ee0a642152ae1fbfaa49 (diff) | |
Fix a runtime break caused by merge conflict
Kwd changed the name of WifiHotspotService to PasspointService; and
the reference to the name was moved in master. Merge ended up picking
up incorrect name WifiPasspointService. This change fixes that.
Bug: 15106138
Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions