tree 8b0d24364dd5b81485107519010438e63688da19
parent 82b88bd6cb60faa4876214c1ecba9c27ecae356f
parent 50ab22edc4f24a337db99d425714787c7849385c
author Raman Tenneti <rtenneti@google.com> 1573111522 -0800
committer android-build-merger <android-build-merger@google.com> 1573111522 -0800

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

Change-Id: If10988cffb0b00dcc6b4a7d8c514544b030d94f1