OSDN Git Service

Merge "docs: Fix broken camera example" into nyc-dev
authorMark Goldstein <markgoldstein@google.com>
Tue, 30 Aug 2016 18:39:37 +0000 (18:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 30 Aug 2016 18:39:37 +0000 (18:39 +0000)
am: 36f4638fe7

Change-Id: I93725b6c49591f174ff4863386724be865cb9715


Trivial merge