diff options
author | Roy West <rwest@google.com> | 2010-09-29 10:40:06 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-29 10:40:06 -0700 |
commit | b4a28f24263fbccce4b77b47c2f3ddac63a8a75f (patch) | |
tree | adbabee03f16fd0c3ab46affaa6b9a5396a76c7b /graphics/java/android/renderscript/RenderScript.java | |
parent | 8bd545ab4f7e75634c970b50ed15c20858d6ac0c (diff) | |
parent | d146c233c570af3ee31d2e6ac44082571026d619 (diff) |
am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp
* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
Partial fix to bug 2992589: Edit dev admin strings.
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions