tree e56b4dce89035ba4b928ec17987bbf8ad27a0ab2
parent 6a54f4e67bbffa743da4273efb6cb5e9df38cfd8
parent d2e9486bbf88cfe83f9ce3a7e2f86ea4ddf271bc
author Scott Main <smain@google.com> 1349306104 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349306104 -0700

am d2e9486b: Merge "re-write the Dialog guide to focus on using DialogFragment" into jb-dev-docs

* commit 'd2e9486bbf88cfe83f9ce3a7e2f86ea4ddf271bc':
  re-write the Dialog guide to focus on using DialogFragment