Commit 11e453d5 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Merge "Refactored CustomVirtualView to be more generic..." into oc-dev... 

Merge "Merge "Refactored CustomVirtualView to be more generic..." into oc-dev am: 490b7111 am: b17707e1 am: 3fce711f" into oc-mr1-dev-plus-aosp
am: dfaf14e8

Change-Id: Iba75e9db651f67e7ccf2f08e92a5e90d0a3c8b01
parents f3f39417 dfaf14e8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment