Dirk Dougherty
9a6672beb1
resolved conflices for merge of 93ccd1a2 to master
...
Change-Id: Ic77367cb9c90027e036a461697295fd604b50014
2014-05-14 14:50:13 -07:00
Dirk Dougherty
93ccd1a2eb
am 0540bc37: am a4e6c7d1: am 3506ac87: Doc change: Updated content for distribute.
...
* commit '0540bc373c84b4ab590708cc9f79c95eeac5114c':
Doc change: Updated content for distribute.
2014-05-14 21:24:24 +00:00
Dirk Dougherty
3506ac87c0
Doc change: Updated content for distribute.
...
Change-Id: I612fbb8e5b7aedd73c0e633e5517bb89375760ed
2014-05-14 14:10:51 -07:00
Ricardo Cervera
3144fde70f
am 4472b649: am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs
...
* commit '4472b649f975f2ddf6450bfdfd8fd1eae7a92e46':
docs: Added release notes for Build Tools 19.1.0
2014-05-13 17:45:22 +00:00
Ricardo Cervera
4472b649f9
am 7ce3b5ef: am 04c9d193: am 9d7cf825: Merge "docs: Added release notes for Build Tools 19.1.0" into klp-docs
...
* commit '7ce3b5ef64b1a183b75279016e6fc4f65be8c933':
docs: Added release notes for Build Tools 19.1.0
2014-05-13 17:40:01 +00:00
Ricardo Cervera
a7a55c1ef4
docs: Added release notes for Build Tools 19.1.0
...
Change-Id: Icd162f7b1b7634b7b503d6d39a17fcb1c43a74c9
2014-05-13 10:21:35 -07:00
David Friedman
4146d546a4
Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-docs
2014-05-05 17:05:22 +00:00
Scott Main
201a24f652
am 7cb2bf1b: am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '7cb2bf1bf3d6ecb9c0a104c3cbc6486b5ffd8652':
add intel USB vendor ID bug: 13982556
2014-05-02 18:21:05 +00:00
Scott Main
7cb2bf1bf3
am 3525b3c7: am 44e7ed77: am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '3525b3c7e9d7d4fd2c60d88f6e3b92c30ec68558':
add intel USB vendor ID bug: 13982556
2014-05-02 18:18:34 +00:00
Scott Main
44e7ed77f1
am 5584601c: add intel USB vendor ID bug: 13982556
...
* commit '5584601c8ade068f403808a3c2b5e9c611134ab2':
add intel USB vendor ID bug: 13982556
2014-05-02 18:10:30 +00:00
Scott Main
5584601c8a
add intel USB vendor ID
...
bug: 13982556
Change-Id: I34fae455f0eee04088bed3f79243776321c745cf
2014-05-02 10:50:50 -07:00
Vince Harron
731bc6bd31
am 165b965e: am 4f50911a: am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Rem
...
* commit '165b965edb42460ef9b0add89a76a311c707a1e2':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
2014-04-25 23:28:10 +00:00
Vince Harron
165b965edb
am 4f50911a: am e9a4e9de: Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that
...
* commit '4f50911aa18f9d4650c6721456dd05ac499fcefd':
Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
2014-04-25 23:25:11 +00:00
Vince Harron
a47d6ed761
Clarified recommended use cases for NDK.
...
Added - "game engines" officially supported use case for NDK
Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++
Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
Change-Id: I098de65bf0c4b4ab4a85611426b68613692e52c5
(cherry picked from commit 8da272f4fe4f1d50543afe488406d56b669364a1)
2014-04-25 23:17:52 +00:00
Vince Harron
e9a4e9deaa
Merge "Clarified recommended use cases for NDK. Added - "game engines" officially supported use case for NDK Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++ Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory." into klp-ub-dev
2014-04-25 23:17:37 +00:00
Ricardo Cervera
af6f910de7
am 9d7c58cf: am 6fe328c6: am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
...
* commit '9d7c58cf8b609e5eda1c7d4df252a723b2dd5c23':
docs: Added release notes for ADT 22.6.3
2014-04-25 22:59:36 +00:00
Ricardo Cervera
9d7c58cf8b
am 6fe328c6: am 86afa0b5: am 039bd508: Merge "docs: Added release notes for ADT 22.6.3" into klp-docs
...
* commit '6fe328c62abd3b98aceeeb99aaf5d824bd42adc6':
docs: Added release notes for ADT 22.6.3
2014-04-25 22:37:45 +00:00
Ricardo Cervera
a28bcbc961
docs: Added release notes for ADT 22.6.3
...
Change-Id: Ic79a03a40db39e66adb226518ddaaeeaf13d17b2
2014-04-17 12:10:24 -07:00
Vince Harron
8da272f4fe
Clarified recommended use cases for NDK.
...
Added - "game engines" officially supported use case for NDK
Removed - "self-contained" ambiguous in general and confusing to someone who is trying to do game development in C++
Removed - "that don't allocate a lot of memory" game engines do allocate a lot of memory.
Change-Id: I098de65bf0c4b4ab4a85611426b68613692e52c5
2014-04-13 14:57:27 -07:00
Ricardo Cervera
0504d2fa94
am 80790fe0: am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
...
* commit '80790fe0e71d6fb4b34a311062244d16d0d9c07a':
docs: Added a document on debugging in Android Studio
2014-04-11 16:21:22 +00:00
Ricardo Cervera
80790fe0e7
am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs
...
* commit '7186228ae8505c3222be81680811d00de9bbdb6d':
docs: Added a document on debugging in Android Studio
2014-04-11 16:19:06 +00:00
Ricardo Cervera
a765e78241
Merge "docs: Added a document on debugging in Android Studio" into klp-docs
2014-04-11 16:06:23 +00:00
Ricardo Cervera
629c34ee18
docs: Added a document on debugging in Android Studio
...
Change-Id: I073e1db6d7976db0f658aac4aa377877ed931aa2
2014-04-10 11:09:24 -07:00
Ricardo Cervera
ce16215d7b
am c6d4a464: am 13d49e9f: am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs
...
* commit 'c6d4a4647074e7d9f4882e54637567103108c0e3':
docs: Updated the link to buy a Nexus phone. Bug: 13671312
2014-04-04 17:14:16 +00:00
Ricardo Cervera
c6d4a46470
am 13d49e9f: am e2bdd6ae: am 6ae21ea7: Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs
...
* commit '13d49e9f364965169f933bcad6bcaeeb2f29fade':
docs: Updated the link to buy a Nexus phone. Bug: 13671312
2014-04-04 17:07:43 +00:00
Ricardo Cervera
6ae21ea7fb
Merge "docs: Updated the link to buy a Nexus phone. Bug: 13671312" into klp-docs
2014-04-04 16:51:20 +00:00
Ricardo Cervera
3358898cd8
am 3b7432d2: am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio
...
* commit '3b7432d2e4ddc9efda5cc38f9008d40d6b4ef951':
docs: Renamed the document on building with Android Studio
2014-04-01 19:38:16 +00:00
Ricardo Cervera
3b7432d2e4
am bb755da9: am c192cdd3: am cf96f815: docs: Renamed the document on building with Android Studio
...
* commit 'bb755da9f7a2a4d3ea103afbc2140901d28e8f74':
docs: Renamed the document on building with Android Studio
2014-04-01 19:29:38 +00:00
Ricardo Cervera
cf96f81585
docs: Renamed the document on building with Android Studio
...
Change-Id: Icc2d3562f8d77b593e7a7bac61675a5b15fcd535
2014-04-01 10:16:45 -07:00
Ricardo Cervera
7abf5cdc95
docs: Updated the link to buy a Nexus phone. Bug: 13671312
...
Change-Id: Ie16f3a86e58af8367e065d444c497fe4c920b2ed
2014-03-28 10:15:24 -07:00
Ricardo Cervera
2cd84701fe
am cddd3b15: am bb7bb60a: am e94b79d7: am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs
...
* commit 'cddd3b151f3eff197c39e319b8c5d107dcafcbce':
docs: Added info on using HTTPS for the Eclipse ADT update site
2014-03-26 23:17:02 +00:00
Ricardo Cervera
cddd3b151f
am bb7bb60a: am e94b79d7: am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs
...
* commit 'bb7bb60a713f7c11ed23203318c50e2c0103b08d':
docs: Added info on using HTTPS for the Eclipse ADT update site
2014-03-26 23:12:22 +00:00
Ricardo Cervera
e94b79d703
am c5b54aed: Merge "docs: Added info on using HTTPS for the Eclipse ADT update site" into klp-docs
...
* commit 'c5b54aed1772de65d3f799e3fb6644ec1b791130':
docs: Added info on using HTTPS for the Eclipse ADT update site
2014-03-26 22:59:15 +00:00
Ricardo Cervera
1da618761f
docs: Added info on using HTTPS for the Eclipse ADT update site
...
Change-Id: Ia784ef37ef8a520183587ee696ec8f8541dbf441
2014-03-26 15:33:44 -07:00
Ricardo Cervera
6519d853c4
am 39d1b3f0: am a8d12f76: am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
...
* commit '39d1b3f0b887f37555924cc3737347b2c4044ce9':
docs: Added release notes for Support Library 19.1.0
2014-03-26 20:04:05 +00:00
Ricardo Cervera
39d1b3f0b8
am a8d12f76: am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
...
* commit 'a8d12f764ccf85da52b82d6726c4a2a12c475fcf':
docs: Added release notes for Support Library 19.1.0
2014-03-26 19:53:28 +00:00
Ricardo Cervera
19a67a71d0
Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
2014-03-26 19:41:04 +00:00
Ricardo Cervera
583080d87c
am 5d005ba9: am 3d093ea6: am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
...
* commit '5d005ba9a7e5d0bab8b1a8ce9b332e30fa3b5054':
docs: Added Android Studio build system doc.
2014-03-26 18:29:32 +00:00
Ricardo Cervera
5d005ba9a7
am 3d093ea6: am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
...
* commit '3d093ea69a488e4afd982a59273f0bf8c3474b5a':
docs: Added Android Studio build system doc.
2014-03-26 18:23:10 +00:00
Ricardo Cervera
1b59f29157
Merge "docs: Added Android Studio build system doc." into klp-docs
2014-03-26 18:06:51 +00:00
Ricardo Cervera
3cd141c59f
docs: Added Android Studio build system doc.
...
Added a document explaning how to use the new build system
in Android Studio.
Change-Id: I45ae1902820c1aaaf4c5810ee683b4d7a5221f16
2014-03-25 15:49:36 -07:00
Ricardo Cervera
e535c1e587
am 8460e8ff: am 287b5bb2: am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2
...
* commit '8460e8ffa3c697c63fb092528648351508bc7c7f':
docs: Amend SDK release notes for 22.6.2
2014-03-25 22:20:14 +00:00
Ricardo Cervera
287b5bb241
am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2
...
* commit '64906b52423a9829e7af9ff512fb18b0947f9920':
docs: Amend SDK release notes for 22.6.2
2014-03-25 22:08:12 +00:00
Ricardo Cervera
1f88794f41
am 805f3fae: am 917a83da: am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
...
* commit '805f3fae25677d04d71470948d1ad855d5d6d9eb':
docs: Added release notes for Android SDK 22.6.2
2014-03-25 21:23:57 +00:00
Ricardo Cervera
ba8169ac46
am ba6bbb01: am addeab5c: am bd48af2c: am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4.
...
* commit 'ba6bbb01d4f8b60c3c124797700122b717a2a5c4':
docs: Added release notes for Google APIs System Image v4.
2014-03-25 21:19:53 +00:00
Ricardo Cervera
39aed838f5
docs: Amend SDK release notes for 22.6.2
...
Change-Id: I76e46ec5abf7e9f2203eeaef723d06597565d4c9
2014-03-25 13:50:55 -07:00
Ricardo Cervera
917a83da70
am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
...
* commit '7133208a816dc3eedf9c45309112c05f7d9136e0':
docs: Added release notes for Android SDK 22.6.2
2014-03-25 20:43:23 +00:00
Ricardo Cervera
825280d2ac
Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
2014-03-25 20:22:59 +00:00
Ricardo Cervera
60bec60b9c
docs: Added release notes for Android SDK 22.6.2
...
Change-Id: I6c8abb75b10cf4bc983f67954c169c7ac9ab9b1c
2014-03-25 12:34:32 -07:00
Ricardo Cervera
addeab5c04
am bd48af2c: am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4.
...
* commit 'bd48af2cd753025828bb5e76194da0f910b99ba3':
docs: Added release notes for Google APIs System Image v4.
2014-03-25 10:04:59 +00:00