tree 9957730630f481c9b3be4ce806b70125ee44b5f0
parent b4b73bb5d981181ed8fcdf895e7193ca248b2497
parent 20d6b77dd2ebabc58ac4d10f4d4274ab0d8e5907
author Xin Li <delphij@google.com> 1606166068 -0800
committer Xin Li <delphij@google.com> 1606166068 -0800

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I0ff1f1cc1932f7446425cc7ad32d4533a3f790e0
Change-Id: Ia62dc7f164f6d89b0cbfb8663c8cd7352388fea6