diff options
| author | Scott Main <smain@google.com> | 2012-01-05 09:45:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-05 09:45:19 -0800 |
| commit | 47228cac900cd58d0687b6e6d980381cfc8010a1 (patch) | |
| tree | 955e33dd5593e9a2e06152592364e93463156f69 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d32ee5baa057992431263907ec5cf8f19b43c043 (diff) | |
| parent | dacbf67ab915fa8b987f6fb9f044160af92652cd (diff) | |
am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit 'dacbf67ab915fa8b987f6fb9f044160af92652cd':
docs: second set of diagram updates
docs: Update lifecycle diagrams to use new omnigraffle designs; add corresponding graffle files update discussion of activity state restore for clarification
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions