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

Browse Source

...

This commit is contained in:

Kevin Hufnagle

2016-05-26 23:06:42 +00:00

committed by Android (Google) Code Review

parent 38b5946fae 397ae7a2e6

commit 8d063a396f

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