diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-06-24 16:04:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-24 16:04:07 -0700 |
| commit | cac3126c6109854640266c4807e5aa8e6a87142f (patch) | |
| tree | 2fad0023faa97e3180cb480de385b4856e702d54 /graphics/java/android/renderscript/RenderScript.java | |
| parent | 2eb12a47224f1617787c09824107ac6bc22f9b3e (diff) | |
| parent | 5340bffd8bb2599d15ee79cca3c62d2e7c7ea961 (diff) | |
am 5340bffd: am 5827d3ea: Merge "Properly note the current active restore set\'s token" into froyo
Merge commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961' into gingerbread-plus-aosp
* commit '5340bffd8bb2599d15ee79cca3c62d2e7c7ea961':
Properly note the current active restore set's token
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions