summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorVinit Deshpande <vinitd@google.com>2014-05-20 11:50:17 -0700
committerVinit Deshpande <vinitd@google.com>2014-05-20 11:50:17 -0700
commite715e8cc00de841d690bddd1e17741a0e9b05293 (patch)
tree9cfcf38aa77cd8debf7d2fd232404e4df289cbff /rs/java/android/renderscript/RenderScript.java
parentf564c7fe86d2aa9a7622667771d9e4bbf5518ffa (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/RenderScript.java')
0 files changed, 0 insertions, 0 deletions