| commit | 79102ad0f56135335bccc935bbaeb4c5d8115214 | [log] [tgz] |
|---|---|---|
| author | Dan Egnor <egnor@google.com> | Tue Jul 20 13:58:57 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 20 13:58:57 2010 -0700 |
| tree | 170dd912e617ba4b612910f3a18d0e09db8f3290 | |
| parent | dd2060932a7472ce361faacd340b0ef05b14c6ef [diff] | |
| parent | fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a [diff] |
am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp * commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a': COMMENT-ONLY change to clarify Camera documentation.