Adarsh Fernando
6ad0274f7e
Merge "Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links." into mnc-mr-docs am: 80202c0 am: a1b59e1
...
am: ad68538
* commit 'ad68538160c7a0ce6cb74ca3dfbb7b0789e4a3c7':
Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links.
Change-Id: I635232489bc55ccf6f19c7f7c242999e792d8781
2016-04-27 03:15:16 +00:00
Joe Fernandez
6c3822ef5a
Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237
...
am: b79b808
* commit 'b79b80882c34f0c540e84c7a3a90b73c617e0635':
docs: InfoPros, Project 02, Batch 03
Change-Id: Iccf5c61e7c9a7da81d8df114076a94a86983e247
2016-04-27 03:11:53 +00:00
Mary Yanchar
3adc5cbdf9
Merge "Clarified how to regenerate debug.keystore" into mnc-mr-docs am: 1452c87 am: 98a02c0
...
am: 33b03ae
* commit '33b03aea27af14f6dce4fa535a0d68995dd9a32e':
Clarified how to regenerate debug.keystore
Change-Id: I389e9f6eab9eabeb4d4d9b9fbfe2ec32234c46b6
2016-04-27 03:08:12 +00:00
Cheryl Potter
ad51d974a1
Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206" into mnc-docs am: b93a913 am: 33f241d am: d67e559
...
am: 3e59527
* commit '3e59527525368dd4906a698becc6221dcd5c4005':
docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206
Change-Id: I04c386d2033c0acdc200c9c812f092689422663d
2016-04-27 02:06:02 +00:00
Adarsh Fernando
25e8a02a9d
Merge "Docs: minor AS 2.0 related fixes" into mnc-mr-docs am: a598807 am: 9d9cea5
...
am: 583d485
* commit '583d485dd23e8ed3edf5ac88a95b28059f9bcf28':
Docs: minor AS 2.0 related fixes
Change-Id: Ie4623b65b070c5a0cc62f75bb329cf05642cdc0c
2016-04-27 02:04:34 +00:00
smain@google.com
0b23ca93b6
delete irrelevant manifest documentation am: 3c8d502 am: 1800bef
...
am: 19319de
* commit '19319de2a4cb99df98a9183ae573fa60f012ea54':
delete irrelevant manifest documentation
Change-Id: I6effa389d9c1d5ac655700d86945bf1d79128ea0
2016-04-27 01:54:16 +00:00
Adarsh Fernando
da375cb6f4
Merge "Docs: Added release notes for SDK Tools 25.0.0" into mnc-mr-docs am: ffb094d am: 16c507d
...
am: c4870e5
* commit 'c4870e5bb53a6b5099f1b7b28da54d44c3594703':
Docs: Added release notes for SDK Tools 25.0.0
Change-Id: I9db7f0235750bc0ed54ee7ecf9b5a6e746876c34
2016-04-27 01:46:20 +00:00
Andrew Solovay
62e4dd414b
Merge "docs: Updated support library release notes for 23.3.0" into mnc-mr-docs am: 3db9afa am: a37dd29
...
am: 4aff1c1
* commit '4aff1c1dbffd15580841d1e64be9877c5da8b624':
docs: Updated support library release notes for 23.3.0
Change-Id: Id225c98b4877fa721328f7a1eceb9ebf011f6116
2016-04-27 01:42:13 +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
* commit 'e493677b21d78b273767e422c701a95e82a214ac':
docs: Data Binding 2.0 updates b/26892478
Change-Id: I9c4db095849d39e86f01f6640fcc68f2e9cfcef4
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
* commit '86eb9f3770faf3fbae439d583db31a5055a06625':
Docs: Minor edit to IR docs to mention longer intial/clean builds
Change-Id: I52767d1d4a5b0421611056747f0f8bb41c548ae7
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
* commit '39579d70b3d729a228c76ae06beeff06c5e94150':
docs: URL and App Indexing API updates for AS 2.0 support b/26642964
Change-Id: Id71f67c7af800535071103c16924daaf6efa72d8
2016-04-26 21:50:44 +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
ad68538160
Merge "Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links." into mnc-mr-docs am: 80202c0
...
am: a1b59e1
* commit 'a1b59e12877bc39ad243605aed9e03cb3c186be0':
Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links.
Change-Id: Ib4b6eb1225937c37e61ad68df21a7d8918650f53
2016-04-26 07:55:15 +00:00
Joe Fernandez
b79b80882c
Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005
...
am: 94e5237
* commit '94e52371b1512ec7248856bc369d52db4887cedc':
docs: InfoPros, Project 02, Batch 03
Change-Id: I7b25fca6d54a0729881c6918b7e020ee1b182594
2016-04-26 07:52:52 +00:00
Mary Yanchar
33b03aea27
Merge "Clarified how to regenerate debug.keystore" into mnc-mr-docs am: 1452c87
...
am: 98a02c0
* commit '98a02c0b9a39bc1caba968520416e16e84f2b43b':
Clarified how to regenerate debug.keystore
Change-Id: I6b61531f71b1b2ba4c8eef90f935e5d786e32b21
2016-04-26 07:50:42 +00:00
Cheryl Potter
3e59527525
Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206" into mnc-docs am: b93a913 am: 33f241d
...
am: d67e559
* commit 'd67e559ebc45aa0bf2c0b1aedbcf2ba535fc5a48':
docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206
Change-Id: I7cadd3545fd68566bcfda00647a96ab06cb3a705
2016-04-26 06:35:27 +00:00
Adarsh Fernando
583d485dd2
Merge "Docs: minor AS 2.0 related fixes" into mnc-mr-docs am: a598807
...
am: 9d9cea5
* commit '9d9cea52c2e9f4de6f194350ad93108ff6ef35e4':
Docs: minor AS 2.0 related fixes
Change-Id: Id05869c446ba6399fbc29ea242a7b7a9a28db851
2016-04-26 06:33:59 +00:00
smain@google.com
19319de2a4
delete irrelevant manifest documentation am: 3c8d502
...
am: 1800bef
* commit '1800befb2656a53b2d8b31783f480aa3b82e6617':
delete irrelevant manifest documentation
Change-Id: Ic7b1ac881028da42d2749274e92099e8144783b3
2016-04-26 06:27:21 +00:00
Adarsh Fernando
c4870e5bb5
Merge "Docs: Added release notes for SDK Tools 25.0.0" into mnc-mr-docs am: ffb094d
...
am: 16c507d
* commit '16c507ded3d9460a3a76aeb75aa875c26ec2a939':
Docs: Added release notes for SDK Tools 25.0.0
Change-Id: I816761c62cb8a4e5f5cdc9dde03dafe7499b48b1
2016-04-26 06:21:43 +00:00
Andrew Solovay
4aff1c1dbf
Merge "docs: Updated support library release notes for 23.3.0" into mnc-mr-docs am: 3db9afa
...
am: a37dd29
* commit 'a37dd29cea3629bcbd406b89b2dee02dd5e79e56':
docs: Updated support library release notes for 23.3.0
Change-Id: If60a65818f47a02d7aa11903aeb6cfb3d16b22cc
2016-04-26 06:18:57 +00:00
Adarsh Fernando
453e69c1dd
Merge "Docs: Added AS 2.0 Release Notes" into mnc-mr-docs am: a49d235
...
am: ecb082f
* commit 'ecb082feec1584d19fa5c2d3449b43b9d53afdec':
Docs: Added AS 2.0 Release Notes
Change-Id: I1e4ee1fbc094dca0980f4a61506823168f325473
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
* commit 'e10717c5a6849abbde4252060b4a4f690d27d973':
docs: Data Binding 2.0 updates b/26892478
Change-Id: I4dcd2b8124ed6970a97bd6313ce05101854798b7
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
* commit 'b0ccc393ad26d47231fd6f5df9f8dace4dd71034':
docs: Emulator 25.0.10 docs for AS 2.0 release b/24816712
Change-Id: I849b75d4badbc5a13ac1719a25c25271fcb378fd
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
* commit 'f2a8f835cf003242932fdc6006a2f55fa825847a':
Docs: Minor edit to IR docs to mention longer intial/clean builds
Change-Id: I1399011cebe73726544fdbba2f8a2627420df7e6
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
* commit '97c36d3f8c090a688d36407f0f940bdf7b427910':
docs: AVD Manager docs for AS 2.0 b/26907919
Change-Id: I505cbc0f5ae1d223251aa6624aa380881da5060e
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
* commit '13308fc2197a664152164fa97d7aa7cf89813390':
docs: URL and App Indexing API updates for AS 2.0 support b/26642964
Change-Id: I04df592849842145a99aae15835614d7547432fb
2016-04-26 04:53:15 +00:00
Adarsh Fernando
f6544435b5
Merge "Docs: Added Instant Run feature overview section" into mnc-mr-docs am: 3dbc405
...
am: 6eed040
* commit '6eed04022a753a433b8201e52a42f363d775572a':
Docs: Added Instant Run feature overview section
Change-Id: Ie06ca12bb135c16a8a86e8d8cb043f9c80fed5d1
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
* commit 'abb5afc713899d160245c4ddf7e1d53b2b60844b':
Docs: Added Android Plugin for Gradle v2.0.0 Release Notes
Change-Id: I00c6641c531ccf2110e4aa3fc6fbaf068136e0db
2016-04-26 04:46:46 +00:00
Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Adarsh Fernando
80202c028b
Merge "Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links." into mnc-mr-docs
2016-04-11 21:33:33 +00:00
Adarsh Fernando
b26d21b5b4
Docs: Android Plugin DSL Ref 2.0.0 was just published. Added some useful links.
...
Change-Id: Ib7657afaedf988af89969491266c1a72e91b3f5c
2016-04-11 12:59:10 -07:00
Joe Fernandez
d00f005049
Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs
2016-04-11 16:24:36 +00:00
Joe Fernandez
7adb4c8a45
docs: InfoPros, Project 02, Batch 03
...
- Removing API 15 and lower work-arounds
b/26490262
Change-Id: Ie8ca92bbff68ca3bc67d2b81164d970058a8a8a8
2016-04-11 09:21:03 -07:00
Mary Yanchar
3164a7264f
Clarified how to regenerate debug.keystore
...
Clarified that you must both build and run to regenerate a
missing/expired debug.keystore file (have tested that this fix works
on Linux and Mac), removed information about troubleshooting for
non-Gregorian calendars because the original issue has been marked as
outdated and is no longer a problem.
(https://code.google.com/p/android/issues/detail?id=834 )
Bug: 18064192
Change-Id: I1235fa14044e388ccf578beebfc77349eb6205cf
2016-04-08 14:52:14 -07:00
Cheryl Potter
33f241d5bd
Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206" into mnc-docs
...
am: b93a913
* commit 'b93a913cb888a09f18695799e331584927e914c0':
docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206
Change-Id: Ib8ab0f875f075dab71ba40c25ee0ee9494668946
2016-04-08 00:29:10 +00:00
Cheryl Potter
b93a913cb8
Merge "docs: Remove obsolete deep link term from AS 2.0 Code Tools page b/28075206" into mnc-docs
2016-04-08 00:20:42 +00:00
Cheryl Potter
2f14bb5853
docs: Remove obsolete deep link term from AS 2.0 Code Tools page
...
b/28075206
Change-Id: I5775695b5563fc61e0eb1d4706537ed713804421
2016-04-07 16:21:30 -07:00
Adarsh Fernando
037dd285e1
Docs: minor AS 2.0 related fixes
...
Change-Id: Ibd247ad52bacd6a839f243f37398d0b0c225436e
2016-04-07 11:46:47 -07:00
smain@google.com
3c8d502db9
delete irrelevant manifest documentation
...
Change-Id: I5301c7910a135fa7ed1b4132f712bd74d67a3170
2016-04-07 07:36:05 -07:00
Adarsh Fernando
ffb094d005
Merge "Docs: Added release notes for SDK Tools 25.0.0" into mnc-mr-docs
2016-04-07 01:20:34 +00:00
Adarsh Fernando
c93b4a8833
Docs: Added release notes for SDK Tools 25.0.0
...
Change-Id: I9c4497e574d049a2ac04ff7c2a416496cbfc0e83
2016-04-06 18:18:02 -07:00
Andrew Solovay
3db9afa4d6
Merge "docs: Updated support library release notes for 23.3.0" into mnc-mr-docs
2016-04-07 00:25:16 +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
Cheryl Potter
a9b10e35ed
Merge "docs: Data Binding 2.0 updates b/26892478" into mnc-docs
...
am: 2ebdbd2
* commit '2ebdbd23a8394d775dcae05a604e83434ed846bd':
docs: Data Binding 2.0 updates b/26892478
Change-Id: I7cbf0f97b2ea41583611c75fd89a385447091ee9
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
* commit '9e9b15e01d61bdbd890ed861eb7c1099813861ba':
docs: Emulator 25.0.10 docs for AS 2.0 release b/24816712
Change-Id: I04374ac4580ab668e271f195837f1b97ea10800e
2016-04-06 22:05:18 +00:00