tree 58b9888a43e1c874625fd6963cc467746c6f57df
parent 61b253b36ac0633826e60841e683b7944e1e5863
parent e69a0d574e67e682f67aa41d7f31b39a8ac91ce0
author Raman Tenneti <rtenneti@google.com> 1573111882 -0800
committer android-build-merger <android-build-merger@google.com> 1573111882 -0800

Merge "AOSP/Camera2 - Updated to sdkVersion 29." am: ce2060ef5b am: 50ab22edc4
am: e69a0d574e

Change-Id: I4c79199c2bde0665a1174d73fc58fe4ba1bc7457