conflict fix
Merge branch 'choigoon' of https://github.com/Family-of-loves/Android
into hagi4u
Edit ClassDiagram.ucd