diff options
| author | Scott Main <smain@google.com> | 2012-01-05 12:09:07 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-05 12:09:07 -0800 |
| commit | d1a8229227f1e8b81a927ef694257dfe0707c985 (patch) | |
| tree | 284a97a6c70871ffd2c330d274e069e35b754bf3 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b1483cb9ca4291791ab6b58cf7b8c5cfea179132 (diff) | |
| parent | 47228cac900cd58d0687b6e6d980381cfc8010a1 (diff) | |
am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit '47228cac900cd58d0687b6e6d980381cfc8010a1':
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