Skip to content
Commit 024ea641 authored by Anton Hansson's avatar Anton Hansson
Browse files

resolve merge conflicts of 887f4fbc to rvc-qpr-dev-plus-aosp 

Bug: 171029603
Test: No
Change-Id: I94146ebaf21cabd54105059fee3f07ba4043aa76
Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979
parents ec0c0bde 887f4fbc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment