tree 46865c58f7dce01ee04f0601e0ee97b883dfe249
parent df66e3cb29b998008bb646309dbbbfb284a6bcb5
parent b41f01dd71216cce25c08989f612d780ef1ff59e
author Shuzhen Wang <shuzhenwang@google.com> 1545088218 -0800
committer android-build-merger <android-build-merger@google.com> 1545088218 -0800

[automerger skipped] Merge "Camera: Clarify configureStreams doc" am: 4ffb6e0bd8 am: 30ce543051
am: b41f01dd71  -s ours

Change-Id: Iabbeaa6c9a649836fe872336102815f95197ff66