diff options
author | Clay Murphy <claym@google.com> | 2017-07-11 16:26:54 -0700 |
---|---|---|
committer | Clay Murphy <claym@google.com> | 2017-07-11 16:26:54 -0700 |
commit | 410be2f22e567f9ab8d0490f4457e8cd651fa991 (patch) | |
tree | 0cc00e020aeded4bb49bdb0088a9763d0176fd91 /en/_index.yaml | |
parent | eee70913d1765f2e17ed27fbd97b8ed41426a149 (diff) | |
parent | 97621834cda62dcf3870da248df1a134a302afee (diff) | |
download | source.android.com-410be2f22e567f9ab8d0490f4457e8cd651fa991.tar.gz |
resolve merge conflicts of 97621834 to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I46e88a190244b311a1145b095ad39d0f536b8794
Diffstat (limited to 'en/_index.yaml')
-rw-r--r-- | en/_index.yaml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/en/_index.yaml b/en/_index.yaml index deaf9354..c99beff7 100644 --- a/en/_index.yaml +++ b/en/_index.yaml @@ -60,6 +60,14 @@ landing_page: image_path: /images/android_stack.png - heading: News items: + - heading: July Android Security Bulletin + description: > + The July 2017 Android Security Bulletin has been published along with + links to associated fixes and new build numbers to support the July + Android security release. + buttons: + - label: July 6th, 2017 + path: /security/bulletin/2017-07-01 - heading: Updated Debugging Docs description: > Debugging documentation has been updated with details on using @@ -76,14 +84,6 @@ landing_page: buttons: - label: May 3rd, 2017 path: /source/devices#960hikey - - heading: May Android Security Bulletin - description: > - The May 2017 Android Security Bulletin has been published along with - links to associated fixes and new build numbers to support the May - Android security release. - buttons: - - label: May 2nd, 2017 - path: /security/bulletin/2017-05-01 - heading: Evaluating Performance in Detail description: > Detailed instructions now exist for understanding and examining the |