[automerger] Merge "Camera: codegen doc update" into pi-dev am: 941189bf28 am: f1558d2929

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Tue, 19 Jun 2018 20:37:58 +0000 (20:37 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Tue, 19 Jun 2018 20:37:58 +0000 (20:37 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Tue, 19 Jun 2018 20:37:58 +0000 (20:37 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Tue, 19 Jun 2018 20:37:58 +0000 (20:37 +0000)
diff --cc core/java/android/hardware/camera2/CaptureResult.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Tue, 19 Jun 2018 20:37:58 +0000 (20:37 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Tue, 19 Jun 2018 20:37:58 +0000 (20:37 +0000)