Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a5ed6aa authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread 

Merge commit '154a3200' into gingerbread-plus-aosp

* commit '154a3200':
  fix inaccurate copyrights
parents 8e258000 154a3200
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment