tree 022e4dd5ec212632f8b5589be6eb291866915f17
parent 0c6bd9350040776666341a5f2e7d1886df800735
parent 9383961480c1ff0512d763d84dea2e226a279174
author Anton Hansson <hansson@google.com> 1547459701 -0800
committer android-build-merger <android-build-merger@google.com> 1547459701 -0800

Merge "Move Camera2 and its libs to /product" am: a7f96bb3e7
am: 9383961480

Change-Id: Ie763bb6fc0d098754ce9cf5fbc0981910f74f118