tree a166f1da06c64c7a0fc3a2171e05ab303299b945
parent d4d39a5047a5f45c073532d4a4798d04baf08681
parent b0ac1da2f9a68c4a9c05b0c4bb87f2dadac70ce3
author Xin Li <delphij@google.com> 1606182288 -0800
committer Xin Li <delphij@google.com> 1606182288 -0800

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

Bug: 172690556
Merged-In: I2b488741827d03bbb4ff21de562ebaf9e80656be
Change-Id: Iedbb563e569af1127e34822a5f3fa8457947a179