Commit 4f033908 authored by Stephen Hines's avatar Stephen Hines Committed by Android Git Automerger
Browse files

am 18aa7840: resolved conflicts for merge of 1870c071 to lmp-dev-plus-aosp 

* commit '18aa7840':
  Remove deprecated carousel from frameworks/ex.
parents 7158b670 18aa7840
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