tree db384672a2bfd7121a6a42c6c4fe72c82990f694
parent 835fdfdd4ba6529ecd6d36b6436141e0d1c8fca3
parent 17c211b4a1215d14fdd7909fdd734bbd4a7b9fb0
author Zachary Iqbal <zacharyi@google.com> 1555738277 -0700
committer android-build-merger <android-build-merger@google.com> 1555738277 -0700

[automerger skipped] Merge "Exposed Android.bp shared library target for libcamera2ndki (cherrypick)" am: 8504f3a776 am: e3f1576471 -s ours
am: 17c211b4a1 -s ours
am skip reason: change_id Iea501d8a54b8cbda2c5ab22fd91247577e304ce0 with SHA1 096ab36269 is in history

Change-Id: I378cb5294ac43f708b166e8b8103d6df2f7cbe73