tree 485b152b97bf8321fdd223f35587bb4294672be8
parent ddf6c13a12d5e188c1f268c6478baf4244200d52
parent 55ec71116fb95ed0b21d570d2f12587a9d60b354
author Scott Main <smain@google.com> 1325785519 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1325785519 -0800

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