smain@google.com
5ab5711f31
Merge "add instructions to change Android SDK location when using N Preview bug: 28017690" into mnc-mr-docs am: e5cbba2 am: 414150f
...
am: 4b63685
2016-04-27 01:39:42 +00:00
Adarsh Fernando
214f81dcf5
Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs am: a49d235 am: ecb082f
...
am: 453e69c
* commit '453e69c1dd1914f026e8d55bf28582d4167cf560':
Docs: Added AS 2.0 Release Notes
Change-Id: If044b4cd47ff2072e067fe43b2319ec92dbe37cd
2016-04-27 01:38:21 +00:00
Cheryl Potter
64607b17a6
Merge "docs: Data Binding 2.0 updates b/26892478" into mnc-docs am: 2ebdbd2 am: a9b10e3 am: e10717c
...
am: e493677
2016-04-27 01:35:45 +00:00
smain@google.com
fce137748a
resolve merge conflicts of 886bbdb to nyc-dev
...
Change-Id: Ib6a009d086ff9f4c3a568124170cd6203f1b385b
2016-04-26 18:09:06 -07:00
Adarsh Fernando
52c591d1b7
Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315 am: f2a8f83
...
am: 86eb9f3
2016-04-27 00:40:09 +00:00
smain@google.com
49d7803f04
resolve merge conflicts of 946609b to nyc-dev
...
Change-Id: Ic96e9e78d16255bfd2fc43df5180c2b1a766ea2d
2016-04-26 17:25:09 -07:00
Cheryl Potter
dc8f3eb2f3
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d am: 13308fc2
...
am: 39579d7
2016-04-26 21:50:44 +00:00
smain@google.com
ed790130de
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6 am: c4ec690
...
am: 73b5cc9
2016-04-26 21:49:15 +00:00
smain@google.com
80704cffc6
change Mac JDK requirement to 6 am: 611a2f4 am: 3b1f66c
...
am: 0619ef2
2016-04-26 21:47:09 +00:00
Adarsh Fernando
38b412c09d
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405 am: 6eed040
...
am: f654443
* commit 'f6544435b561a4ca50a070dc4dd665dda94becff':
Docs: Added Instant Run feature overview section
Change-Id: Id14287bc04647fc19e477e9ce9469ff9874e322a
2016-04-26 21:44:35 +00:00
Adarsh Fernando
57034255d5
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1 am: abb5afc
...
am: fe47b6d
* commit 'fe47b6d6455dc9e13e7a80e50107fc007ad3daf1':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I4b00bcf7936dc1c5db1d3f54417a4aa1381853c0
2016-04-26 21:42:02 +00:00
Adarsh Fernando
dd0d888973
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413 am: 88d1e91
...
am: 8776f89
2016-04-26 21:39:34 +00:00
Scott Main
4b636857fb
Merge "add instructions to change Android SDK location when using N Preview bug: 28017690" into mnc-mr-docs am: e5cbba2
...
am: 414150f
2016-04-26 06:17:18 +00:00
Adarsh Fernando
453e69c1dd
Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs am: a49d235
...
am: ecb082f
2016-04-26 06:16:00 +00:00
Cheryl Potter
e493677b21
Merge "docs: Data Binding 2.0 updates b/26892478" into mnc-docs am: 2ebdbd2 am: a9b10e3
...
am: e10717c
2016-04-26 06:14:20 +00:00
Cheryl Potter
886bbdba7d
Merge "docs: Emulator 25.0.10 docs for AS 2.0 release b/24816712" into mnc-docs am: 9e9b15e am: 566c9be
...
am: b0ccc39
2016-04-26 06:13:06 +00:00
Adarsh Fernando
86eb9f3770
Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs am: e60e315
...
am: f2a8f83
2016-04-26 06:11:42 +00:00
Cheryl Potter
946609b454
Merge "docs: AVD Manager docs for AS 2.0 b/26907919" into mnc-docs am: 8dbdfc4 am: 027d322
...
am: 97c36d3
2016-04-26 06:10:34 +00:00
Cheryl Potter
39579d70b3
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs am: cffbbc8 am: 8af8d4d
...
am: 13308fc2
2016-04-26 04:53:15 +00:00
Scott Main
73b5cc9cf3
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs am: b9709f6
...
am: c4ec690
2016-04-26 04:51:27 +00:00
smain@google.com
0619ef243f
change Mac JDK requirement to 6 am: 611a2f4
...
am: 3b1f66c
2016-04-26 04:50:01 +00:00
Adarsh Fernando
f6544435b5
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405
...
am: 6eed040
2016-04-26 04:48:13 +00:00
Adarsh Fernando
fe47b6d645
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes am: b896cd1
...
am: abb5afc
2016-04-26 04:46:46 +00:00
Adarsh Fernando
8776f8940a
Merge "Docs: Added instructions to launch instrumented tests in AS using CTL" into mnc-mr-docs am: 7961413
...
am: 88d1e91
2016-04-26 04:44:56 +00:00
Dake Gu
eb8d2fcb50
leanback: Fix link to changed API setTitle()
...
To match ag/952395.
Change-Id: I96cf9caa34bd560f14f7864201f3ac228cd2537d
2016-04-21 14:50:26 -07:00
Trevor Johns
59c9a93fc2
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
...
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee
2016-04-20 18:35:57 +00:00
Trevor Johns
483abe2d8b
Remove links to createAndInitializeUser() and createUser()
...
These methods in DevicePolicyManager have been removed from the
public API in NYC.
Converting @link tags to @code to avoid error during JavaDoc gen.
Change-Id: I5d481ccf65bcf83a61f43cfac8ae474656ff34c1
2016-04-19 17:01:12 -07:00
Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc3
2016-04-19 02:03:59 -07:00
Alex Klyubin
a65707d3f3
Clarify how to replace cert generated by Android Keystore.
...
This updates Android Keystore developer documentation to clarify how
to replace the self-signed certificate create by Android Keystore when
it generates a new key pair. Some developers are attempting to use
KeyStore.setCertificateEntry which is the wrong method for this. The
correct method is KeyStore.setKeyEntry.
Bug: 28152878
Change-Id: I306447b7792ecad5fbb49bd691a57bedb5207003
2016-04-13 15:33:53 -07:00
Chad Brubaker
2df5ba777a
Document when usesCleartextTraffic is ignored.
...
In N and above when using an Android Network Security Config the
cleartext configuration from that is used and
android:usesCleartextTraffic in the manifest is ignored.
Bug:27596429
Change-Id: I50ec765cead6cfd6bbaec585723f99d72e0fd945
2016-04-12 11:07:51 -07:00
Scott Main
e5cbba2d57
Merge "add instructions to change Android SDK location when using N Preview bug: 28017690" into mnc-mr-docs
2016-04-06 23:50:56 +00:00
Adarsh Fernando
a49d235b07
Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs
2016-04-06 23:42:37 +00:00
smain@google.com
c165dbd294
add instructions to change Android SDK location when using N Preview
...
bug: 28017690
Change-Id: I5ac12346bdf8de1c8871d8ad79a7921c22dc4793
2016-04-06 16:24:46 -07:00
Cheryl Potter
a9b10e35ed
Merge "docs: Data Binding 2.0 updates b/26892478" into mnc-docs
...
am: 2ebdbd2
2016-04-06 22:37:18 +00:00
Cheryl Potter
2ebdbd23a8
Merge "docs: Data Binding 2.0 updates b/26892478" into mnc-docs
2016-04-06 22:31:09 +00:00
Cheryl Potter
566c9be63b
Merge "docs: Emulator 25.0.10 docs for AS 2.0 release b/24816712" into mnc-docs
...
am: 9e9b15e
2016-04-06 22:05:18 +00:00
Cheryl Potter
9e9b15e01d
Merge "docs: Emulator 25.0.10 docs for AS 2.0 release b/24816712" into mnc-docs
2016-04-06 22:00:49 +00:00
Adarsh Fernando
e60e315fc3
Merge "Docs: Minor edit to IR docs to mention longer intial/clean builds" into mnc-mr-docs
2016-04-06 21:31:33 +00:00
Cheryl Potter
8dd7eea307
docs: Data Binding 2.0 updates
...
b/26892478
Change-Id: I78360cb156984468d5ee387575f573c8e5fc9fe1
2016-04-06 14:28:27 -07:00
Adarsh Fernando
29dfc1dace
Docs: Minor edit to IR docs to mention longer intial/clean builds
...
Change-Id: Ie2727cc98bbcf756ae160cbdd160847cec550e0f
2016-04-06 14:04:02 -07:00
Cheryl Potter
6c0d5910c6
docs: Emulator 25.0.10 docs for AS 2.0 release
...
b/24816712
Change-Id: I0bdf916cfbce60d0ca6a1527d3555d722694eaa6
2016-04-06 13:56:26 -07:00
Cheryl Potter
027d3224c0
Merge "docs: AVD Manager docs for AS 2.0 b/26907919" into mnc-docs
...
am: 8dbdfc4
2016-04-06 20:33:07 +00:00
Cheryl Potter
8af8d4d9e9
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs
...
am: cffbbc8
2016-04-06 20:26:12 +00:00
Cheryl Potter
8dbdfc4d3b
Merge "docs: AVD Manager docs for AS 2.0 b/26907919" into mnc-docs
2016-04-06 20:23:27 +00:00
Cheryl Potter
cffbbc8652
Merge "docs: URL and App Indexing API updates for AS 2.0 support b/26642964" into mnc-docs
2016-04-06 20:23:04 +00:00
Scott Main
b9709f6e95
Merge "update Develop tab landing page with Studio 2.0 announcement." into mnc-mr-docs
2016-04-06 19:43:55 +00:00
Cheryl Potter
c8513915df
docs: AVD Manager docs for AS 2.0
...
b/26907919
Change-Id: I8de2b12fa12bcac7b1113e87f35d98300a89a3f9
2016-04-06 11:27:02 -07:00
Adarsh Fernando
1bfa6a655a
Docs: Added AS 2.0 Release Notes
...
Bug: 26853658
2016-04-06 10:15:25 -07:00
Trevor Johns
a5060ee80d
Merge branch 'mnc-mr-docs' into mnc-ub-dev
...
Large merge to reconnect automerger for docs branch to mainline.
Conflicts:
docs/html-intl/intl/es/index.jd
docs/html-intl/intl/es/preview/download.jd
docs/html-intl/intl/es/preview/index.jd
docs/html-intl/intl/ja/index.jd
docs/html-intl/intl/ja/preview/download.jd
docs/html-intl/intl/ja/preview/index.jd
docs/html-intl/intl/ko/index.jd
docs/html-intl/intl/ko/preview/download.jd
docs/html-intl/intl/ko/preview/index.jd
docs/html-intl/intl/pt-br/index.jd
docs/html-intl/intl/pt-br/preview/download.jd
docs/html-intl/intl/pt-br/preview/index.jd
docs/html-intl/intl/ru/index.jd
docs/html-intl/intl/ru/preview/download.jd
docs/html-intl/intl/ru/preview/index.jd
docs/html-intl/intl/zh-cn/index.jd
docs/html-intl/intl/zh-cn/preview/download.jd
docs/html-intl/intl/zh-cn/preview/index.jd
docs/html-intl/intl/zh-tw/index.jd
docs/html-intl/intl/zh-tw/preview/download.jd
docs/html-intl/intl/zh-tw/preview/index.jd
docs/html/guide/topics/manifest/compatible-screens-element.jd
docs/html/guide/topics/manifest/uses-feature-element.jd
docs/html/preview/download.jd
docs/html/preview/features/runtime-permissions.jd
docs/html/sdk/index.jd
docs/html/tools/revisions/studio.jd
docs/html/tools/sdk/eclipse-adt.jd
docs/html/tools/support-library/features.jd
telephony/java/android/telephony/TelephonyManager.java
Bug: 28000173
Change-Id: Iacab0481175f1b32e0ac3bab98cde9e994100e94
2016-04-05 20:32:07 -07:00
smain@google.com
611a2f4f27
change Mac JDK requirement to 6
...
Change-Id: I1b2c8cd393488430b98d618a5c4843a5d5466bac
2016-04-05 19:33:24 -07:00
