Commit b402e3ea authored May 27, 2016 by Kevin Hufnagle Committed by android-build-merger May 27, 2016

Merge "resolve merge conflicts of 7f7eec31 to nyc-dev" into nyc-dev am: 8d063a39

am: 9e2c8401

* commit '9e2c8401':
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.

Change-Id: I279fdda9500f6ee002955b8224ac1f9b4824b0d2

parents e8447884 9e2c8401

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

+1155 −479

File changed.

Preview size limit exceeded, changes collapsed.