Skip to content
Commit cdf3455c authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to... 

am 6dd38cc5: Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i\'ll fix it all later."

* commit '6dd38cc5':
  Revert "Revert "resolved conflicts for merge of 45178b13 to jb-mr2-ub-dev" revert to fix conflicts, i'll fix it all later."
parents 7466b998 6dd38cc5
Expand all 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