OSDN Git Service

am c4294ed2: am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev
authorJason Sams <jsams@google.com>
Mon, 15 Apr 2013 02:28:29 +0000 (19:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Apr 2013 02:28:29 +0000 (19:28 -0700)
* commit 'c4294ed2f1de5c89b5e283942e0d5f8cd8822bfb':
  Unhide new RS APIs.

1  2 
api/current.txt
graphics/java/android/renderscript/RenderScript.java

diff --cc api/current.txt
Simple merge