tree b3decc2d2c364012f45778557779289f447ee65c
parent 923acb14745be3a4e95bf647ae7d1704dfae16f0
parent ea5a81ca4d7742edbea82cfb9971b06095e7c14e
author Mark Urbanus <urbanus@google.com> 1497648115 +0000
committer android-build-merger <android-build-merger@google.com> 1497648115 +0000

Merge "Only derive capture app type if input stream is available" into oc-dr1-dev
am: ea5a81ca4d

Change-Id: I83bc3f142205fd1c6b941b454fa4db7fb7bea27f