diff options
author | Scott Main <smain@google.com> | 2012-01-05 09:42:52 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-05 09:42:52 -0800 |
commit | 55ec71116fb95ed0b21d570d2f12587a9d60b354 (patch) | |
tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 103a6ff9ce0248509db069175f22a22f5330f89a (diff) | |
parent | 1e2efa6270c54ccd16f3e2b3311ecdd972f0ee92 (diff) |
Merge changes I1df85b6a,I7c6a68b6 into ics-mr1
* changes:
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