diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-07 07:16:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 07:16:34 -0700 |
| commit | 55f1b0b82f0d9f6d43b9b2e246d9de0c810e7a7f (patch) | |
| tree | d9eb776ceb941825c932c578e72bbce0c92e414c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6ed0cfd3e798e3014c9f1099631249463d25140c (diff) | |
| parent | 9d6824cd53960b4562ea3c55876b40ca21710050 (diff) | |
am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp
* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
Make Activity.removeDialog() less strict.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions