commit ffb96bf3b1b223e5df232d2217a98fb2294aa237
author Scott Main <smain@google.com> Wed Dec 18 18:29:37 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 18 18:29:37 2013 +0000
tree 21540ec636472527190ee18c84b7780d6abad620
parent 94ee2f502efbf1d31559573a7b05e3addb91d5e7
parent 3bcdbd6b2d96427d7cee835e9ed79aeed51de267

am 3bcdbd6b: am 6fda5415: am 709dca44: am fb214e6b: am 3032999b: Merge "Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution techni

* commit '3bcdbd6b2d96427d7cee835e9ed79aeed51de267':
  Update to the Taking Photos Simply lesson (offshoot of the intent doc rewrite) clarifications about different external directories, information about required permissions, intent resolution technique to match other docs, clarify section headings, plus other code clarification