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

Skip to content
Commit 5a016488 authored by Daisuke Miyakawa's avatar Daisuke Miyakawa
Browse files

Merge commit 'refs/changes/08/29008/8' of... 

Merge commit 'refs/changes/08/29008/8' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import

Conflicts:

	core/java/android/pim/vcard/ContactStruct.java
parents b1fdb1d3 5c3e6879
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