Merge "Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f am: 302e608b73" into nyc-mr1-dev-plus-aosp

Browse Source

...

This commit is contained in:

Android Build Merger (Role)

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

committed by Android (Google) Code Review

parent 67e38c1e96 1b02f32a56

commit 8433e0eb87

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