OSDN Git Service

Merge "docs: Camera JavaDoc - added xref to Camera DevGuide" into ics-mr0
authorJoe Fernandez <joefernandez@google.com>
Tue, 18 Oct 2011 22:02:00 +0000 (15:02 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Oct 2011 22:02:00 +0000 (15:02 -0700)

Trivial merge