diff options
| author | Scott Main <smain@google.com> | 2012-01-05 12:13:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-05 12:13:25 -0800 |
| commit | 5c48202bb841c451f622a115cdc3981f198309be (patch) | |
| tree | 8da2f2172ed043464cc7fa41ad9b127b29ea7d81 /graphics/java/android/renderscript/Program.java | |
| parent | fd552368c49c70c9bcdbb3114c9b53c19566995b (diff) | |
| parent | d1a8229227f1e8b81a927ef694257dfe0707c985 (diff) | |
am d1a82292: am 47228cac: am dacbf67a: Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* commit 'd1a8229227f1e8b81a927ef694257dfe0707c985':
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/Program.java')
0 files changed, 0 insertions, 0 deletions