tree 6d81abeee034ed71103d54d9736c08f219314a34
parent 97d9ac5f91f35d7b50567ff296e0df93d4e7da66
parent 522e88915f43faa05253d181a6eaf5e73cb5f6cd
author Yuntao Xu <yuntaoxu@google.com> 1634757852 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634757852 +0000

Merge "Convert cpp_api/../Android.mk to Android.bp" am: cee1aae4a8 am: 522e88915f

Original change: https://android-review.googlesource.com/c/platform/frameworks/rs/+/1850847

Change-Id: I5e05b721e3efbc7b72af223ec38be2ef2d274c18