tree 284a97a6c70871ffd2c330d274e069e35b754bf3
parent b1483cb9ca4291791ab6b58cf7b8c5cfea179132
parent 47228cac900cd58d0687b6e6d980381cfc8010a1
author Scott Main <smain@google.com> 1325794147 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1325794147 -0800

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