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

Commit 397ae7a2 authored by Kevin Hufnagle's avatar Kevin Hufnagle
Browse files

resolve merge conflicts of 7f7eec31 to nyc-dev 

Change-Id: I35b5b7103b89e0e12e21e809a3d3952738c9a668
parents 0f1ae5fa 7f7eec31

docs/html/guide/topics/manifest/uses-feature-element.jd

+1155 −479

File changed.

Preview size limit exceeded, changes collapsed.