| commit | 02b77f81cfcb7c0105ecc012bcc791f0e2c02e6a | [log] [tgz] |
|---|---|---|
| author | Dan Egnor <egnor@google.com> | Tue Jul 20 16:54:38 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 20 16:54:38 2010 -0700 |
| tree | 5ee773b724e3624768ce96e641f06e652a3a7664 | |
| parent | 19a25c1be9a0b846c5c1b4216edd9b33a23129be [diff] | |
| parent | 79102ad0f56135335bccc935bbaeb4c5d8115214 [diff] |
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.