Commit c418777e authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 953d1f56: resolved conflicts for merge of a9be2d37 to mnc-dr-dev-plus-aosp 

* commit '953d1f56':
  Drop release v2.6.0+no-stlport
parents 3a7f90fc 953d1f56
Expand all 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