diff options
author | Dirk Dougherty <ddougherty@google.com> | 2010-06-03 13:00:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-03 13:00:31 -0700 |
commit | c458d0e3078cad4131fc6a7960c1386b4de95ca6 (patch) | |
tree | b9da2e482347dbb4e07f0289c9dd63b52eab8466 /graphics/java/android/renderscript/RenderScript.java | |
parent | 57ad07039a63e8454d8a73cdce9c5e269f13205c (diff) | |
parent | b85a1679a4a6fae5dd39611ae594f5e2b945407c (diff) |
am b85a1679: am 85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c' into kraken
* commit 'b85a1679a4a6fae5dd39611ae594f5e2b945407c':
Doc change: Adjust security sandbox description.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions