am 54f5ca41: am ffacbc34: am fd2f6358: Merge change I771bebb9 into eclair

Merge commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c'

* commit '54f5ca4115b776eb5a1e04a4c014acccb916ef9c':
  Add Java exceptions to catch RS calls with no context or no surface.

diff --cc graphics/java/android/renderscript/ProgramFragment.java
Simple merge

diff --cc graphics/java/android/renderscript/ProgramVertex.java
Simple merge

diff --cc graphics/java/android/renderscript/RenderScript.java
Simple merge