OSDN Git Service
Ricardo Cervera [Thu, 6 Nov 2014 17:13:58 +0000 (17:13 +0000)]
am
58dc8c42: am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Paul Lawrence [Thu, 6 Nov 2014 17:08:25 +0000 (17:08 +0000)]
Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev
Ricardo Cervera [Thu, 6 Nov 2014 17:03:00 +0000 (17:03 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
e7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Ricardo Cervera [Thu, 6 Nov 2014 17:02:56 +0000 (17:02 +0000)]
am
cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
* commit '
cc0753b077abb1ad5e5e95885567261b35067ed4':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Ricardo Cervera [Fri, 10 Oct 2014 23:04:11 +0000 (16:04 -0700)]
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit
2871e05b48f0b932885986322ce01212717a6399)
Ricardo Cervera [Thu, 6 Nov 2014 16:57:12 +0000 (16:57 +0000)]
Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
Dirk Dougherty [Thu, 6 Nov 2014 05:20:29 +0000 (05:20 +0000)]
am
326c70ef: Doc change: Add play dev guide page with index card and shareable download.
* commit '
326c70efeed9c01e8c8d0f38f7ae27891f726e6b':
Doc change: Add play dev guide page with index card and shareable download.
Dirk Dougherty [Thu, 6 Nov 2014 04:14:15 +0000 (20:14 -0800)]
Doc change: Add play dev guide page with index card and shareable download.
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
(cherry picked from commit
0ce73219be7f37170eb19dba690a5cd8d3e22e21)
Dirk Dougherty [Thu, 6 Nov 2014 04:22:10 +0000 (04:22 +0000)]
Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
Joe Fernandez [Thu, 6 Nov 2014 04:14:26 +0000 (04:14 +0000)]
am
2490ec83: Merge "docs: Add more information for getting started with TV app" into lmp-docs
* commit '
2490ec83702985bd70ac2d28322dc5c9625dc26a':
docs: Add more information for getting started with TV app
Dirk Dougherty [Thu, 6 Nov 2014 04:14:15 +0000 (20:14 -0800)]
Doc change: Add play dev guide page with index card and shareable download.
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
Paul Lawrence [Wed, 5 Nov 2014 22:36:34 +0000 (14:36 -0800)]
DO NOT MERGE: Don't log passwords returned from vdc
Turns off logging of responses from native daemon connector altogether.
Proper solution to follow in LMP MR1
Bug:
18260068
Change-Id: I25bc9cb61049a3efdd9a9cd11195864a04ef05fd
Joe Fernandez [Thu, 6 Nov 2014 01:31:56 +0000 (01:31 +0000)]
Merge "docs: Add more information for getting started with TV app" into lmp-docs
Joe Fernandez [Wed, 5 Nov 2014 06:31:55 +0000 (22:31 -0800)]
docs: Add more information for getting started with TV app
- required manifest entries
- more information on permissions that imply hardware features
Change-Id: I55454ba8725185094bef35b9be653d50b58c8137
Dirk Dougherty [Wed, 5 Nov 2014 22:51:31 +0000 (22:51 +0000)]
am
66296451: Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
* commit '
662964511f88fddbf14941c66bf255acb3f30e2a':
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
Dirk Dougherty [Wed, 5 Nov 2014 22:44:23 +0000 (22:44 +0000)]
Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
Dirk Dougherty [Fri, 31 Oct 2014 23:14:29 +0000 (16:14 -0700)]
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
Change-Id: Ib4c0b0d442b1ef879cb01b3972845ef93360c5b8
John Spurlock [Wed, 5 Nov 2014 21:36:13 +0000 (21:36 +0000)]
am
3a9321d4: Docs: Fix typo in Preference android:order attribute.
* commit '
3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
Docs: Fix typo in Preference android:order attribute.
John Spurlock [Wed, 5 Nov 2014 21:17:50 +0000 (16:17 -0500)]
Docs: Fix typo in Preference android:order attribute.
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
Rich Slogar [Wed, 5 Nov 2014 20:13:35 +0000 (20:13 +0000)]
am
1afa82dc: docs:remove sdk/ndk note
* commit '
1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
docs:remove sdk/ndk note
Andrew Solovay [Wed, 5 Nov 2014 18:47:17 +0000 (18:47 +0000)]
am
d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
* commit '
d9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
docs: Removed broken link to non-existent method.
Ricardo Cervera [Wed, 5 Nov 2014 18:47:13 +0000 (18:47 +0000)]
am
58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
* commit '
58f1200c333deea72ed6e095587f0bcb1fb65ce3':
docs: Add instructions to attach debugger to a running process.
Rich Slogar [Wed, 5 Nov 2014 18:14:56 +0000 (10:14 -0800)]
docs:remove sdk/ndk note
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
Andrew Solovay [Wed, 5 Nov 2014 18:14:04 +0000 (18:14 +0000)]
Merge "docs: Removed broken link to non-existent method." into lmp-docs
Ricardo Cervera [Wed, 5 Nov 2014 17:00:09 +0000 (17:00 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
Ricardo Cervera [Wed, 5 Nov 2014 16:58:22 +0000 (16:58 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
Tom Taylor [Wed, 5 Nov 2014 04:21:07 +0000 (04:21 +0000)]
am
6209d4e4: am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
6209d4e4d8a8662628c53cd5e1944abf30293d87':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Wed, 5 Nov 2014 04:20:11 +0000 (04:20 +0000)]
am
db864e4d: am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
db864e4ddc788a21db6793bbcb5f559131f20736':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Eric Gilmore [Wed, 5 Nov 2014 00:12:16 +0000 (00:12 +0000)]
am
bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
* commit '
bf78adb25e80b9107fcd682d30e7157093681547':
Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.
Eric Gilmore [Tue, 28 Oct 2014 20:33:30 +0000 (13:33 -0700)]
Adding 5.0 emulator image and removing older image.
2nd patch set includes low/high res. images.
Bug:
18026943
Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
Tom Taylor [Tue, 4 Nov 2014 19:18:50 +0000 (19:18 +0000)]
am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:14:26 +0000 (19:14 +0000)]
am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
47419a443591ea3c641da8720514e1384dd75440':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:08:16 +0000 (19:08 +0000)]
am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
192a39044290be84a1086a876a9d4ab0571ab97b':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:00:42 +0000 (19:00 +0000)]
am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
23fb29723c47b2aeb6aecc382a503630a8d8e983':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:50:31 +0000 (18:50 +0000)]
am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
d7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:39:38 +0000 (18:39 +0000)]
am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
b2e54c1b46c275d017fb5bef17add3eb4c465508':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:30:23 +0000 (18:30 +0000)]
am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
75e7fbaa83448753a1db9647e58693f1a281900c':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:23:51 +0000 (18:23 +0000)]
am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
37906e6ebc1985ad4b7151116b7cf4fef8322b19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:18:16 +0000 (18:18 +0000)]
am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
44f6d0d5810ce507394cc514481d977315d2496f':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:11:02 +0000 (18:11 +0000)]
am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Scott Kennedy [Tue, 4 Nov 2014 18:06:32 +0000 (18:06 +0000)]
am
d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
* commit '
d78ce50372ec473b6a895d053f9ffc2956e933ef':
Fix a small typo in a variable name
Tom Taylor [Tue, 4 Nov 2014 18:03:07 +0000 (18:03 +0000)]
am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Scott Kennedy [Tue, 4 Nov 2014 18:01:27 +0000 (18:01 +0000)]
Merge "Fix a small typo in a variable name" into lmp-docs
Ricardo Cervera [Tue, 4 Nov 2014 18:00:56 +0000 (18:00 +0000)]
am
61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs
* commit '
61f91724a9375732cd95333921388a3e5a64ac33':
docs: Fix the circularReveal example.
Ricardo Cervera [Tue, 4 Nov 2014 17:56:21 +0000 (17:56 +0000)]
Merge "docs: Fix the circularReveal example." into lmp-docs
Tom Taylor [Tue, 4 Nov 2014 17:53:14 +0000 (17:53 +0000)]
am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:49:26 +0000 (17:49 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
5244937248b7283b5cf586b5637a108579217d4e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:43:41 +0000 (17:43 +0000)]
am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:42:20 +0000 (17:42 +0000)]
am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bc57a1f81317f765865e3e0c00d3421a3084955e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Ricardo Cervera [Fri, 10 Oct 2014 23:04:11 +0000 (16:04 -0700)]
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
Mark Renouf [Tue, 4 Nov 2014 07:15:18 +0000 (07:15 +0000)]
If no display settings are matched, return the first one. DO NOT MERGE automerge:
cf0f740 -s ours
automerge:
01afc37 -s ours
* commit '
01afc37403a244e75fbfa385b197d76e476213e8':
Mark Renouf [Tue, 4 Nov 2014 07:14:17 +0000 (07:14 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge:
7be03da -s ours
automerge:
ff2e718 -s ours
* commit '
ff2e71830cafe063e876e5a56db0d33a8a5ba679':
kmccormick [Tue, 4 Nov 2014 07:13:11 +0000 (07:13 +0000)]
am
1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge:
3e92c4a
automerge:
5298190
* commit '
5298190a30288d29cb9107d89b00411def3e469b':
Andrew Solovay [Tue, 4 Nov 2014 01:10:53 +0000 (17:10 -0800)]
docs: Removed broken link to non-existent method.
Doc had included link to method MediaBrowserService.onLoadIcon().
Per bug http://b/
17205016 that method was removed before release.
Revised doc is staged to:
http://asolovay.mtv.corp.google.com:9650/reference/android/service/media/MediaBrowserService.Result.html
(Note that the other "See Also" link, which I didn't remove, is badly
formatted because Javadoc seems to choke on links to methods that are
passed generic types. JoeFernandez@, if you can suggest a better way
to format that link I'll make that change too.)
bug:
18229650
Change-Id: Ic55ae8b9edc6dd314cf5acc306abd8a9d5f71134
David Friedman [Tue, 4 Nov 2014 00:59:31 +0000 (00:59 +0000)]
am
a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug:
17192985" into lmp-docs
* commit '
a827de4e8bcd8d90987387b1acf8d8856104e21c':
Fixed ADB documentation to work properly on Windows Bug:
17192985
David Friedman [Tue, 4 Nov 2014 00:05:51 +0000 (00:05 +0000)]
Merge "Fixed ADB documentation to work properly on Windows Bug:
17192985" into lmp-docs
Deepanshu Gupta [Mon, 3 Nov 2014 23:15:01 +0000 (23:15 +0000)]
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:14:44 +0000 (23:14 +0000)]
Merge "Support framework menus in ActionBar" into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:13:13 +0000 (23:13 +0000)]
Merge "Use the right layout for inflating Action Bar." into lmp-dev
Scott Kennedy [Mon, 3 Nov 2014 21:56:18 +0000 (13:56 -0800)]
Fix a small typo in a variable name
Change-Id: If431236bf6885b3b0ef2c967869320538222ee33
Baligh Uddin [Mon, 3 Nov 2014 21:56:10 +0000 (13:56 -0800)]
Import translations. DO NOT MERGE
Bug:
18218486
Change-Id: I929129a2c443e4db78e0ad4e78e653a7cd603855
Auto-generated-cl: translation import
Dirk Dougherty [Mon, 3 Nov 2014 21:13:25 +0000 (21:13 +0000)]
am
e1970f12: Doc change: Tv doc updates for publishing in Google Play.
* commit '
e1970f12583120613bc94e15841f6a7cc7919f68':
Doc change: Tv doc updates for publishing in Google Play.
Luan Nguyen [Mon, 3 Nov 2014 21:10:02 +0000 (21:10 +0000)]
am
049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge:
aec7c97
automerge:
4182391
* commit '
418239190b0d0e6921ee0e1e498a34bb7cddc392':
Joe Fernandez [Mon, 3 Nov 2014 21:08:45 +0000 (21:08 +0000)]
am
0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge:
90f734e
automerge:
3d76f6a
* commit '
3d76f6a9578302e4c6c0de694ec7e0923f3cabe2':
Natalie Masse [Mon, 3 Nov 2014 21:07:41 +0000 (21:07 +0000)]
Scott Rowe [Mon, 3 Nov 2014 21:05:48 +0000 (21:05 +0000)]
am
ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge:
a1e3063
automerge:
e0da6dd
* commit '
e0da6ddc08ff014bf2e5cd619451d95f5ac5663b':
Joe Fernandez [Mon, 3 Nov 2014 21:04:37 +0000 (21:04 +0000)]
am
58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge:
2f9ea27
automerge:
d6ed575
* commit '
d6ed5752da2c741b43d7c4d4d33da955c4fc72b9':
Prashant Malani [Mon, 3 Nov 2014 21:03:23 +0000 (21:03 +0000)]
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge:
645e017 -s ours
automerge:
a8f4b8a -s ours
* commit '
a8f4b8a26055055cc5efa3a33862db6f5ca572a5':
Ricardo Cervera [Mon, 3 Nov 2014 21:02:22 +0000 (21:02 +0000)]
am
8a7ba4c6: Merge "docs: Fixing notify link. Bug:
17571861" into klp-modular-docs automerge:
dc1f308
automerge:
884b473
* commit '
884b473ad8bccfef4e379de9034278ffa2113780':
Luan Nguyen [Mon, 3 Nov 2014 20:59:12 +0000 (20:59 +0000)]
am
2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge:
c07a288
automerge:
cc8b367
* commit '
cc8b36706cd976d8313ba35c238920079005578e':
smain@google.com [Mon, 3 Nov 2014 20:58:03 +0000 (20:58 +0000)]
am
075531ae: add the butterbar for L announce to Preview landing page automerge:
e43bb6a
automerge:
870afdb
* commit '
870afdb39abdb308aee8d035f5e72251059f7af4':
smain@google.com [Mon, 3 Nov 2014 20:56:59 +0000 (20:56 +0000)]
am
d8d20f52: update analytics event tracking calls to use new script bug:
16331906 automerge:
6fbe299
automerge:
469c8c8
* commit '
469c8c898389368b7fb9f34c302d810565e29326':
Ricardo Cervera-Navarro [Mon, 3 Nov 2014 20:55:52 +0000 (20:55 +0000)]
am
7668aa27: am
aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge:
c93723b
automerge:
4687757
* commit '
46877572906d932d27bc39f0a347d17607411282':
Rich Slogar [Mon, 3 Nov 2014 20:54:50 +0000 (20:54 +0000)]
am
a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge:
858cfad
automerge:
d84910b
* commit '
d84910b06b8d8af7de04f975e58a77e65f888374':
Eric Gilmore [Mon, 3 Nov 2014 20:53:40 +0000 (20:53 +0000)]
Merge commit \'
a4eb81b\' into klp-modular-dev-plus-aosp
automerge:
068cb36
* commit '
068cb36877144dc337766c1113250f5ebc2cbf6f':
Joe Fernandez [Mon, 3 Nov 2014 20:50:40 +0000 (20:50 +0000)]
am
a63f81ec: am
e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs
automerge:
a9d803e
* commit '
a9d803e0f7efe4c899ea37a50653452edb6d77fd':
Dirk Dougherty [Sun, 2 Nov 2014 04:40:32 +0000 (21:40 -0700)]
Doc change: Tv doc updates for publishing in Google Play.
cherry-picked from Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888
Change-Id: Ie54c1f6d2923970ea0f9920e34d34f18e3b7e888
Fred Fettinger [Mon, 3 Nov 2014 20:47:38 +0000 (20:47 +0000)]
am
b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE
automerge:
7565da1 -s ours
* commit '
7565da1f38f9bd1aad1749aa829b54fe2df223b6':
smain@google.com [Mon, 3 Nov 2014 20:46:33 +0000 (20:46 +0000)]
am
63cd4977: am
770c3c5e: fix unclickable link due to overlay from offset dev below
automerge:
3f0cf02
* commit '
3f0cf028aef394d91610344850cfc3c2e76b4ebb':
Quddus Chong [Mon, 3 Nov 2014 20:42:23 +0000 (20:42 +0000)]
am
9df3d67b: am
7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
automerge:
581d03b
* commit '
581d03b1d539ebd3180dee5680d712f74011a3e4':
Deepanshu Gupta [Mon, 3 Nov 2014 20:40:55 +0000 (20:40 +0000)]
am
4f133894: Exclude KXmlParser from LayoutLib.
automerge:
adb14af
* commit '
adb14afbfb4c37cfc684537d85123b36539fffed':
Joe Fernandez [Mon, 3 Nov 2014 20:37:46 +0000 (20:37 +0000)]
am
59c04ece: am
bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs
automerge:
37ec657
* commit '
37ec65701121374b0edf3cfc454463c90666399d':
Deepanshu Gupta [Mon, 3 Nov 2014 20:34:42 +0000 (20:34 +0000)]
am
11b14e39: LayoutLib: Use ICU\'s line break algo. [DO NOT MERGE]
automerge:
fcaf3e9 -s ours
* commit '
fcaf3e9bd031e1ad4c38eee1b81064cca75e26b4':
Rich Slogar [Mon, 3 Nov 2014 20:33:08 +0000 (20:33 +0000)]
am
916a6ea3: am
6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs
automerge:
9779c90
* commit '
9779c905eac26ab6ce7ce775587c75f1de081dd4':
Quddus Chong [Mon, 3 Nov 2014 20:31:51 +0000 (20:31 +0000)]
am
bb5a1848: am
8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs
automerge:
dfb86b9
* commit '
dfb86b994ff7d51ba1a1683c7123195cc9930c95':
Quddus Chong [Mon, 3 Nov 2014 20:30:45 +0000 (20:30 +0000)]
am
bf29d697: am
6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs
automerge:
9566bd2
* commit '
9566bd23390b0f21582a59673ded22f47b50ffe0':
Ricardo Cervera [Mon, 3 Nov 2014 20:29:24 +0000 (20:29 +0000)]
am
a18075e8: am
bd964cad: docs: Removing references to self note on Common Intents page.
automerge:
5f9d680
* commit '
5f9d680dd73b437e1e311f11f255b659ad18135b':
Ricardo Cervera [Mon, 3 Nov 2014 20:28:06 +0000 (20:28 +0000)]
am
6d30f576: am
3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
automerge:
a6abe30
* commit '
a6abe30397cf1f67b871a3db7555aa7f0f9841d9':
Quddus Chong [Mon, 3 Nov 2014 20:23:39 +0000 (20:23 +0000)]
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 '
ddb8c4ee47e663ca984ff0291fae2cab2c5bc173':
Ricardo Cervera [Mon, 3 Nov 2014 20:22:28 +0000 (20:22 +0000)]
am
0e61e44d: am
2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs
automerge:
2166913
* commit '
2166913933661f4f85fd649ad55997d59a5e3d31':
Rich Slogar [Mon, 3 Nov 2014 20:21:20 +0000 (20:21 +0000)]
am
64460a2b: am
83d5c9bf: docs:change required ADT version to 23.0.2
automerge:
f07d984
* commit '
f07d984fed70be0718e7e9019bc933f58fbeca46':
smain@google.com [Mon, 3 Nov 2014 20:20:13 +0000 (20:20 +0000)]
am
8267ffcc: am
cef9aab6: Merge "make sdk download links use HTTPS bug:
8033954" into klp-modular-docs
automerge:
90ab19b
* commit '
90ab19bb8dec2e444e274ab4c8990545b481ca7b':
Joe Fernandez [Mon, 3 Nov 2014 19:41:56 +0000 (19:41 +0000)]
am
eff5efac: Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
* commit '
eff5efac2170e05b2a5e197788bf455edee57cce':
docs: Update Android Dashboard for November 2014
Joe Fernandez [Mon, 3 Nov 2014 19:37:19 +0000 (19:37 +0000)]
Merge "docs: Update Android Dashboard for November 2014" into lmp-docs
Joe Fernandez [Thu, 30 Oct 2014 17:57:31 +0000 (10:57 -0700)]
docs: Update Android Dashboard for November 2014
Change-Id: I42b4c58ebfe2b6f486c560d4ccf698d8064d1d39
Ricardo Cervera [Mon, 3 Nov 2014 17:31:32 +0000 (17:31 +0000)]
am
3e621914: Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
* commit '
3e621914cacf692700dce007ec7d7893fcc12a8c':
docs: Add links to Wear UI training from Design pages.
Ricardo Cervera [Mon, 3 Nov 2014 17:27:08 +0000 (17:27 +0000)]
Merge "docs: Add links to Wear UI training from Design pages." into lmp-docs
Scott Rowe [Mon, 3 Nov 2014 16:54:29 +0000 (16:54 +0000)]
am
cd796536: Merge "docs: b/
18119632 isGame, b/
18119595 banner" into lmp-docs
* commit '
cd796536ce81fe6f8a63c3867b57e7b7f92a8542':
docs: b/
18119632 isGame, b/
18119595 banner
Scott Rowe [Mon, 3 Nov 2014 16:24:36 +0000 (16:24 +0000)]
Merge "docs: b/
18119632 isGame, b/
18119595 banner" into lmp-docs
Scott Rowe [Sat, 1 Nov 2014 16:28:23 +0000 (16:28 +0000)]
am
aa275bf9: Merge "docs: b/
15180738 - invalid urls in badge generator" into lmp-docs
* commit '
aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54':
docs: b/
15180738 - invalid urls in badge generator