172050 Commits

Author SHA1 Message Date
smain@google.com
841b7a21f1 am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a
automerge: 870afdb

* commit '870afdb39abdb308aee8d035f5e72251059f7af4':
2014-11-03 20:58:03 +00:00
Joe Fernandez
194d2026a3 am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e
* commit '7d35425b98d7228f1b6fc58e96a2b3b9333318c2':
2014-11-03 20:57:20 +00:00
Fred Fettinger
eeeebfff30 am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1 -s ours
* commit 'b33ca4f38c6b2a804fda7dad4cb488134b485130':
2014-11-03 20:57:15 +00:00
smain@google.com
87c4d66ddd am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299
automerge: 469c8c8

* commit '469c8c898389368b7fb9f34c302d810565e29326':
2014-11-03 20:56:59 +00:00
Ricardo Cervera-Navarro
e3e6193ea0 am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b
automerge: 4687757

* commit '46877572906d932d27bc39f0a347d17607411282':
2014-11-03 20:55:52 +00:00
Rich Slogar
4f8a41cccd am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad
automerge: d84910b

* commit 'd84910b06b8d8af7de04f975e58a77e65f888374':
2014-11-03 20:54:50 +00:00
Eric Gilmore
7ecb0a3e5c Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp
automerge: 068cb36

* commit '068cb36877144dc337766c1113250f5ebc2cbf6f':
2014-11-03 20:53:40 +00:00
smain@google.com
16bc5859b7 am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02
* commit 'a77da17ecc64f6125c954892c6d2dabf1a317be5':
2014-11-03 20:52:11 +00:00
Quddus Chong
0323f8a685 am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b
* commit '68f8326eb4c7e7b56130979dc366c0aba32aa9f8':
2014-11-03 20:52:07 +00:00
Deepanshu Gupta
6f7fd0ba50 am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af
* commit '3eff8312c9c742cc75086d006ecdf36695327f93':
2014-11-03 20:51:40 +00:00
Joe Fernandez
f32a7bc25f am 1daece6f: am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657
* commit '1daece6f4aaf679dbbe5ba4fd54d399e96ff4639':
2014-11-03 20:51:37 +00:00
Deepanshu Gupta
a900a0f1ce am dabb6c05: am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours
* commit 'dabb6c0596a06cd9427070a4202f733db3e13a9d':
2014-11-03 20:51:33 +00:00
Quddus Chong
11c53cecf8 am 3dc6b6ab: am b9120e4c: am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge: dfb86b9
* commit '3dc6b6abc1a159b38bd51897b0e3d52afe57edfb':
2014-11-03 20:51:32 +00:00
Rich Slogar
09e2f41a0a am 10e749a5: am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90
* commit '10e749a5730db65ceb656627c72583fec44ab0f7':
2014-11-03 20:51:29 +00:00
Quddus Chong
0aebb24ae8 am 5f7c43a0: am 7045d963: am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2
* commit '5f7c43a094ddf9de685f4e318872e09da9d50a6a':
2014-11-03 20:51:26 +00:00
Ricardo Cervera
d53e32205c am aace9d17: am 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680
* commit 'aace9d175a68288bac123482281ec61ba73f95b0':
2014-11-03 20:51:20 +00:00
Ricardo Cervera
1a5a1ff499 am b2c0394d: am ea4f3e79: am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30
* commit 'b2c0394dc666e8d3c5e45a8d40829b58cce51f7a':
2014-11-03 20:51:15 +00:00
Joe Fernandez
7d35425b98 am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
automerge: a9d803e

* commit 'a9d803e0f7efe4c899ea37a50653452edb6d77fd':
2014-11-03 20:50:40 +00:00
Dirk Dougherty
e1970f1258 Doc change: Tv doc updates for publishing in Google Play.
cherry-picked from Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888

Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888
2014-11-03 20:48:23 +00:00
Fred Fettinger
b33ca4f38c am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
automerge: 7565da1  -s ours

* commit '7565da1f38f9bd1aad1749aa829b54fe2df223b6':
2014-11-03 20:47:38 +00:00
Deepanshu Gupta
3eff8312c9 am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af
* commit 'ac875484041183a299a36534cbb5a5574f4f93e1':
2014-11-03 20:47:37 +00:00
Joe Fernandez
1daece6f4a am 9e22cd6f: am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs automerge: 37ec657
* commit '9e22cd6fd10983cdd4a84e5a2143cb8ed49e084d':
2014-11-03 20:47:33 +00:00
smain@google.com
a77da17ecc am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below
automerge: 3f0cf02

* commit '3f0cf028aef394d91610344850cfc3c2e76b4ebb':
2014-11-03 20:46:33 +00:00
Quddus Chong
1403f44baa am ff5d2e2d: am 92cfa5d0: am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs automerge: ddb8c4e
* commit 'ff5d2e2d61b13c4595fdb851ad73a3b29d0d7892':
2014-11-03 20:45:39 +00:00
Ricardo Cervera
5e17f08635 am a4877f30: am 5063cf9a: am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913
* commit 'a4877f30a424f8e97f30b363bbee9dd2ffb6cded':
2014-11-03 20:45:34 +00:00
Rich Slogar
e6e140abfb am 3aa8271a: am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984
* commit '3aa8271afc20fb3a7cbdd3c317029963ad41c512':
2014-11-03 20:45:29 +00:00
smain@google.com
07d46a3880 am 7c2f87ec: am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b
* commit '7c2f87ec560c4b75f8750a6fa9b81cdef51be8c6':
2014-11-03 20:45:24 +00:00
Quddus Chong
3dc6b6abc1 am b9120e4c: am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge: dfb86b9
* commit 'b9120e4c95f81cbee0563a2cbf47c466e72b16aa':
2014-11-03 20:44:37 +00:00
Quddus Chong
5f7c43a094 am 7045d963: am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2
* commit '7045d9639f77c6edaa892e1cacc489f1897f9899':
2014-11-03 20:44:33 +00:00
Ricardo Cervera
aace9d175a am 5ef2d855: am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680
* commit '5ef2d855f0a55377af53a05f2f48015a10a29151':
2014-11-03 20:44:30 +00:00
Ricardo Cervera
b2c0394dc6 am ea4f3e79: am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30
* commit 'ea4f3e793a0be91bf6b06801fec08e028ade0a75':
2014-11-03 20:44:26 +00:00
Deepanshu Gupta
dabb6c0596 am ec276ed1: am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE] automerge: fcaf3e9 -s ours
* commit 'ec276ed12645cc1c735babab1dc7d272fc96a292':
2014-11-03 20:42:54 +00:00
Rich Slogar
10e749a573 am 6ae208d4: am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs automerge: 9779c90
* commit '6ae208d455fd2dba80ad9d7cf181ccdeac8c0bb7':
2014-11-03 20:42:50 +00:00
Quddus Chong
68f8326eb4 am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
automerge: 581d03b

* commit '581d03b1d539ebd3180dee5680d712f74011a3e4':
2014-11-03 20:42:23 +00:00
Deepanshu Gupta
ac87548404 am 4f133894: Exclude KXmlParser from LayoutLib.
automerge: adb14af

* commit 'adb14afbfb4c37cfc684537d85123b36539fffed':
2014-11-03 20:40:55 +00:00
Quddus Chong
ff5d2e2d61 am 92cfa5d0: am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs automerge: ddb8c4e
* commit '92cfa5d0b20b52cd1e61c5fef36abe0d67525fa2':
2014-11-03 20:38:24 +00:00
Ricardo Cervera
a4877f30a4 am 5063cf9a: am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913
* commit '5063cf9abca48f6e07ef7efd27232e1759704119':
2014-11-03 20:38:03 +00:00
Rich Slogar
3aa8271afc am 4f62925e: am a34b1f15: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 automerge: f07d984
* commit '4f62925ecb2f049aec7392f84d494328f883cb92':
2014-11-03 20:37:59 +00:00
smain@google.com
7c2f87ec56 am 0646885d: am c64c937a: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs automerge: 90ab19b
* commit '0646885ddfb5c04cd0c5276e66b51b1a14691c4c':
2014-11-03 20:37:55 +00:00
Joe Fernandez
9e22cd6fd1 am 59c04ece: am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
automerge: 37ec657

* commit '37ec65701121374b0edf3cfc454463c90666399d':
2014-11-03 20:37:46 +00:00
Quddus Chong
b9120e4c95 am 03f627c4: am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs automerge: dfb86b9
* commit '03f627c4b469d4a85bb3b747ef49d0a20b853f08':
2014-11-03 20:36:18 +00:00
Quddus Chong
7045d9639f am bea6b4d1: am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs automerge: 9566bd2
* commit 'bea6b4d12106e2a918274ffccd6e370f48654979':
2014-11-03 20:36:14 +00:00
Ricardo Cervera
5ef2d855f0 am e5eaf36c: am a18075e8: am bd964cad: docs: Removing references to self note on Common Intents page. automerge: 5f9d680
* commit 'e5eaf36c01e2b3e4d5072b2fa478bc9cc7336e51':
2014-11-03 20:36:09 +00:00
Ricardo Cervera
ea4f3e793a am d6007644: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs automerge: a6abe30
* commit 'd6007644353347f49090337b3683dcca7092ed3d':
2014-11-03 20:36:05 +00:00
Deepanshu Gupta
ec276ed126 am 11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
automerge: fcaf3e9  -s ours

* commit 'fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':
2014-11-03 20:34:42 +00:00
Rich Slogar
6ae208d455 am 916a6ea3: am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
automerge: 9779c90

* commit '9779c905eac26ab6ce7ce775587c75f1de081dd4':
2014-11-03 20:33:08 +00:00
Quddus Chong
03f627c4b4 am bb5a1848: am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
automerge: dfb86b9

* commit 'dfb86b994ff7d51ba1a1683c7123195cc9930c95':
2014-11-03 20:31:51 +00:00
Quddus Chong
bea6b4d121 am bf29d697: am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
automerge: 9566bd2

* commit '9566bd23390b0f21582a59673ded22f47b50ffe0':
2014-11-03 20:30:45 +00:00
Quddus Chong
92cfa5d0b2 am c9c18671: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs automerge: ddb8c4e
* commit 'c9c186711d88d4869e4cbd53f83bc12806b6ffb5':
2014-11-03 20:30:09 +00:00
Ricardo Cervera
5063cf9abc am d89021d7: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs automerge: 2166913
* commit 'd89021d7aaac209a354e02e72fac5c063e8f92fd':
2014-11-03 20:30:05 +00:00