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

Commit 1dde14bc authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a45e9251: am dcd58cfd: Merge change I7b9328c7 into eclair 

Merge commit 'a45e9251' into eclair-mr2-plus-aosp

* commit 'a45e9251':
  Fix issue #2300232: Bugs in resolving conflicting pointers
parents 15620b1e a45e9251
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