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 /renderScript | |
| parent | 1d7eda16e531bebe8673a0d7554b324d931cb28e (diff) | |
| parent | d08288ee77884f98eed8a6eccd3d02565118de39 (diff) | |
| download | android-33d6fb265f691ce46aa575dc10a5bd6ee5bb812e.tar.gz | |
Resolve merge conflicts of d08288e to master
Diffstat (limited to 'renderScript')
| -rw-r--r-- | renderScript/BasicRenderScript/README.md | 2 | ||||
| -rw-r--r-- | renderScript/RenderScriptIntrinsic/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/renderScript/BasicRenderScript/README.md b/renderScript/BasicRenderScript/README.md index 2d440840..b12e9486 100644 --- a/renderScript/BasicRenderScript/README.md +++ b/renderScript/BasicRenderScript/README.md @@ -29,7 +29,7 @@ Pre-requisites -------------- - Android SDK 24 -- Android Build Tools v24.0.0 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots diff --git a/renderScript/RenderScriptIntrinsic/README.md b/renderScript/RenderScriptIntrinsic/README.md index 05e1207a..f5ff558d 100644 --- a/renderScript/RenderScriptIntrinsic/README.md +++ b/renderScript/RenderScriptIntrinsic/README.md @@ -38,7 +38,7 @@ Pre-requisites -------------- - Android SDK 24 -- Android Build Tools v24.0.0 +- Android Build Tools v24.0.1 - Android Support Repository Screenshots |