tree e5c7cb975b61b9c900a18075f0ecc4d15e772462
parent 6c7e98aedfe98d84882065d31b03667c5095716d
parent 8d0ffb70511c7be32db5e887757465a60b2959ab
author dimitry <dimitry@google.com> 1555719711 -0700
committer android-build-merger <android-build-merger@google.com> 1555719711 -0700

[automerger skipped] Merge "Rename libcamera2.so -> libcamera2ndk.so (cherrypick)" am: e4c67d26f6
am: 8d0ffb7051 -s ours
am skip reason: change_id I50e02aad90e4bdf06faf60f687a18cc3d9de98e4 with SHA1 d7e265bf79 is in history

Change-Id: I3490410ede9062fd4cfb21c3e91e4e310dd33c7e