Skip to content

Commit 4eae25d

Browse files
authoredMay 19, 2020
Merge pull request android#89 from android/nb/develop-into-master
Merge develop branch into master.
2 parents 4424171 + 8a2068c commit 4eae25d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+566
-711
lines changed
 

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: macOS-latest # enables hardware acceleration in the virtual machine
1313
strategy:
1414
matrix:
15-
api-level: [21, 29]
15+
api-level: [23, 29]
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v2

‎JetNews/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Run UI tests from Android Studio or with the `./gradlew connectedCheck` command.
8282
## License
8383

8484
```
85-
Copyright 2019 Google, Inc.
85+
Copyright 2020 The Android Open Source Project
8686
8787
Licensed to the Apache Software Foundation (ASF) under one or more contributor
8888
license agreements. See the NOTICE file distributed with this work for

0 commit comments

Comments
 (0)
Please sign in to comment.