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 | b34baf5f6a7aaec9fbb31ebc8ca2f1e8f06e7293 (patch) | |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ddf6c13a12d5e188c1f268c6478baf4244200d52 (diff) | |
| parent | 55ec71116fb95ed0b21d570d2f12587a9d60b354 (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 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions