Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev

Browse Source

am: 8d063a396f

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

Change-Id: I5459f1583202ccf9567e67382a1098f3a92fc0fd

...

This commit is contained in:

Kevin Hufnagle

2016-05-27 03:27:58 +00:00

committed by android-build-merger

parent 828d701667 8d063a396f

commit 302e608b73

1 changed files with 1144 additions and 468 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1612

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

File diff suppressed because it is too large Load Diff