| commit | 9e2c84014fcf852b5f796689a891e5919a3cc508 | [log] [tgz] |
|---|---|---|
| author | Kevin Hufnagle <khufnagle@google.com> | Thu May 26 23:13:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 26 23:13:55 2016 +0000 |
| tree | 8e4236936415800542cf47f48aaac89e9c84db2f | |
| parent | 0361d504da7a842108218deed7610e26ba783089 [diff] | |
| parent | 8d063a396fbce3fae74c423a181a36272ee91231 [diff] |
Merge "resolve merge conflicts of 7f7eec3 to nyc-dev" into nyc-dev am: 8d063a396f * commit '8d063a396fbce3fae74c423a181a36272ee91231': Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page. Change-Id: I040555beba971dbf0d2a41f620344def7d5b970f