| commit | 0dda53db5ec131632d46283a81c850be3dc779bd | [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 | 0c919194c090714877b2c62e25984e00b216d760 | |
| parent | 4efee956644b2ce56d46aabc1412afb72c966e11 [diff] | |
| parent | e26a37d2591736aa3062f8deacc61525ea0c7fb3 [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.