diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-08-12 11:53:59 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2016-08-12 11:53:59 -0700 |
| commit | 33d6fb265f691ce46aa575dc10a5bd6ee5bb812e (patch) | |
| tree | 015c4c5f35b295ae6d847bdb293bef15078504b7 /ui/views/HorizontalPaging/README.md | |
| parent | 1d7eda16e531bebe8673a0d7554b324d931cb28e (diff) | |
| parent | d08288ee77884f98eed8a6eccd3d02565118de39 (diff) | |
| download | android-33d6fb265f691ce46aa575dc10a5bd6ee5bb812e.tar.gz | |
Resolve merge conflicts of d08288e to master
Diffstat (limited to 'ui/views/HorizontalPaging/README.md')
| -rw-r--r-- | ui/views/HorizontalPaging/README.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/views/HorizontalPaging/README.md b/ui/views/HorizontalPaging/README.md index 66a746ea..c03ba9a9 100644 --- a/ui/views/HorizontalPaging/README.md +++ b/ui/views/HorizontalPaging/README.md @@ -30,8 +30,8 @@ know the selected tab, so you can update your ActionBar with `setSelectedNavigat Pre-requisites -------------- -- Android SDK v23 -- Android Build Tools v23.0.0 +- Android SDK 24 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots @@ -60,7 +60,7 @@ submitting a pull request through GitHub. Please see CONTRIBUTING.md for more de License ------- -Copyright 2014 The Android Open Source Project, Inc. +Copyright 2016 The Android Open Source Project, Inc. Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for |