Dan Egnor 02b77f81cf am 79102ad0: am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread
Merge commit '79102ad0f56135335bccc935bbaeb4c5d8115214'

* commit '79102ad0f56135335bccc935bbaeb4c5d8115214':
  COMMENT-ONLY change to clarify Camera documentation.
2010-07-20 16:54:38 -07:00
..
2010-07-19 17:41:03 -07:00
2010-07-16 15:18:56 -07:00