OSDN Git Service
Dirk Dougherty [Thu, 16 Jan 2014 00:20:11 +0000 (00:20 +0000)]
am
b888739d: am
dd8def1e: am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
b888739d3857e26308942574363e072d5cfbcbad':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:17:13 +0000 (00:17 +0000)]
am
dd8def1e: am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
dd8def1e15bf0726ea087f46f91c0f1d533621c9':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:14:07 +0000 (16:14 -0800)]
am
5f26f2c9: am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
5f26f2c9d2ae49a3f20bfaa1c73b93ea61881209':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:10:34 +0000 (00:10 +0000)]
am
6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
* commit '
6ec44a882b87fffb37e9dbafe8c5535f16faf349':
Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
Dirk Dougherty [Thu, 16 Jan 2014 00:07:34 +0000 (00:07 +0000)]
Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs
Wink Saville [Thu, 16 Jan 2014 00:03:13 +0000 (00:03 +0000)]
am
ab092bb0: am
46988138: am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
ab092bb065b09ac0caa000269025c5a5ec951973':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Thu, 16 Jan 2014 00:00:18 +0000 (00:00 +0000)]
am
46988138: am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
469881381b081157b95e8e5ee3c9293bbbc1c852':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Wed, 15 Jan 2014 23:57:10 +0000 (15:57 -0800)]
am
57756970: am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
5775697029760ca886a287ef2c3119d5097ded56':
Fixed mistaken reference to "LTE". Bug
7637224
Wink Saville [Wed, 15 Jan 2014 23:49:14 +0000 (15:49 -0800)]
am
a6aa3199: Merge "Fixed mistaken reference to "LTE". Bug
7637224"
* commit '
a6aa3199bdb676e349c28b861a04c34a4ec136e0':
Fixed mistaken reference to "LTE". Bug
7637224
quddusc [Wed, 15 Jan 2014 23:47:45 +0000 (23:47 +0000)]
am
cf280856: am
f6490353: am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
cf280856d69a63b61bc4c5e8e61033174273fb9b':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:47:39 +0000 (23:47 +0000)]
am
18ae7b08: am
dba65d6f: am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
18ae7b0846a70be3e9cad1741130699e10ea5ca5':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
Wink Saville [Wed, 15 Jan 2014 23:44:53 +0000 (23:44 +0000)]
Merge "Fixed mistaken reference to "LTE". Bug
7637224"
quddusc [Wed, 15 Jan 2014 23:43:52 +0000 (23:43 +0000)]
am
f6490353: am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
f6490353833bba0826d5a21f3b41b451135da4e6':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:43:47 +0000 (23:43 +0000)]
am
dba65d6f: am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
dba65d6fb5b9489ac5434ce3eece7f66227442f1':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:40:55 +0000 (15:40 -0800)]
am
77916b9a: am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
77916b9ae1a5780f0aac46eb00d0fc835a8d6c84':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:40:50 +0000 (15:40 -0800)]
am
57edc17c: am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
57edc17c398b3b438e1a3264219a6fa7f444341a':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:37:08 +0000 (23:37 +0000)]
am
bf43ef27: Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
* commit '
bf43ef272ad386ad89d115ab8be1b706ae29034e':
docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature.
quddusc [Wed, 15 Jan 2014 23:37:04 +0000 (23:37 +0000)]
am
563daeea: cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
* commit '
563daeeaf11bb17c8570e11de63d1f1d6fb0c8bc':
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
quddusc [Wed, 15 Jan 2014 23:34:49 +0000 (23:34 +0000)]
Merge "docs: Updated Play Games services landing page to reflect new turn-based multiplayer feature." into klp-docs
quddusc [Wed, 4 Dec 2013 03:31:14 +0000 (19:31 -0800)]
cherrypick from klp-ub-dev docs: Added API reference docs for Halloumi release. Change-Id: Ibf46f4cc314ab7156b1ef429bac66ada0c890bda
Change-Id: I6b00a0b0c209b2703db62ea7fd103ac6a58b36a8
Ricardo Cervera [Wed, 15 Jan 2014 21:18:07 +0000 (21:18 +0000)]
am
6150b2c6: am
4f216e1d: am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
6150b2c6ac95dc9b0bd3556d6e542402b5899da6':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:13:41 +0000 (21:13 +0000)]
am
4f216e1d: am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
4f216e1db9c01e5bbdf461fe25d41bad2874c082':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:11:13 +0000 (13:11 -0800)]
am
c919f4f4: am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
c919f4f47787245ddda32d0e41e7bae0facd0ee8':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:07:21 +0000 (21:07 +0000)]
am
bab2235a: Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
* commit '
bab2235ae89e37452e9be8a8b6d2581fe59e0162':
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Ricardo Cervera [Wed, 15 Jan 2014 21:03:54 +0000 (21:03 +0000)]
Merge "docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954" into klp-docs
Jeff Hao [Wed, 15 Jan 2014 19:48:18 +0000 (19:48 +0000)]
am
6c13f384: am
56b11064: am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
6c13f384749150e9fa6f930023a9161fe97402d0':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:45:06 +0000 (19:45 +0000)]
am
56b11064: am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
56b110649424534de36ca41b3e352a73b6bdf3c0':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:41:30 +0000 (11:41 -0800)]
am
9a5005a3: am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
9a5005a3bfa419cb856a83ca34a67556d9fd5b74':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:38:01 +0000 (11:38 -0800)]
am
f6730d26: Merge "Add sample profiling interface to startMethodTracing."
* commit '
f6730d26841377de0f7ee60fa78c6ef2f8be1f2e':
Add sample profiling interface to startMethodTracing.
Jeff Hao [Wed, 15 Jan 2014 19:34:39 +0000 (19:34 +0000)]
Merge "Add sample profiling interface to startMethodTracing."
Jeff Hao [Mon, 6 Jan 2014 23:52:52 +0000 (15:52 -0800)]
Add sample profiling interface to startMethodTracing.
Frameworks base side of this change. Also changed art and libcore.
Change-Id: Ib5ba0445163dca714d1ae66430750346ff8811be
Ricardo Cervera [Wed, 15 Jan 2014 19:25:10 +0000 (11:25 -0800)]
docs: Aded uses-feature to multiple Google Play APK Filtering. Bug:
12271954
Change-Id: I6c247e172b2a6dd0ef25afc6cf33f0960fc0fa8d
Review: http://quixote.mtv.corp.google.com:8101/google/play/publishing/multiple-apks.html
quddusc [Wed, 15 Jan 2014 18:08:32 +0000 (18:08 +0000)]
am
25e1900b: am
e8ae214c: am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
25e1900beee4959be28ede9e00b8c5e8f10c1e17':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 18:04:31 +0000 (18:04 +0000)]
am
e8ae214c: am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
e8ae214c31b4c5c2e90538b9d0a5c258e32fafeb':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 18:00:53 +0000 (10:00 -0800)]
am
f4011173: am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
f40111731581f03dc1b447b432331b3415fb87b9':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 17:57:27 +0000 (17:57 +0000)]
am
31573d45: Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
* commit '
31573d45933886237dd6414978486b79a4dd4f9f':
docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754
quddusc [Wed, 15 Jan 2014 17:55:21 +0000 (17:55 +0000)]
Merge "docs: Added link to in-app billing testing API guide and removed misleading statement. Bug:
9436754" into klp-docs
Marco Nelissen [Wed, 15 Jan 2014 17:29:43 +0000 (17:29 +0000)]
am
e495a5a3: am
cb15fb60: am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
e495a5a3f3feec6319262a6bdab3b7704d6ab843':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:27:19 +0000 (17:27 +0000)]
am
cb15fb60: am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
cb15fb6041e604025d4b76645435f8cbafee754c':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:22:55 +0000 (09:22 -0800)]
am
0d4916f1: am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
0d4916f19f81f80fc83eb7646c6d339630d5f618':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:19:52 +0000 (09:19 -0800)]
am
c3036a12: Merge "Before requerying a cursor, check if it is closed."
* commit '
c3036a12467395465b86e6935af8aa500c1b128d':
Before requerying a cursor, check if it is closed.
Marco Nelissen [Wed, 15 Jan 2014 17:17:05 +0000 (17:17 +0000)]
Merge "Before requerying a cursor, check if it is closed."
Craig Mautner [Wed, 15 Jan 2014 01:07:15 +0000 (01:07 +0000)]
Merge "Retain stacks even if they are empty." into klp-modular-dev
Matthew Xie [Tue, 14 Jan 2014 20:44:16 +0000 (20:44 +0000)]
Merge changes I86b3fa60,I7fa4e847 into klp-modular-dev
* changes:
BLE peripheral mode (3/4): Add peripheral mode API.
NPE in BluetoothSocket.write()
quddusc [Tue, 14 Jan 2014 20:42:10 +0000 (20:42 +0000)]
am
f1809bae: am
65e3350c: am
916277e4: am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
f1809bae546c8a6a435968b22527b0dcd325b4a1':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:42:04 +0000 (20:42 +0000)]
am
d689a06e: am
9bc3bde7: am
5e5c9833: am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
d689a06eb7c3d16ecf057e3b355c7ae83f07af90':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:41:59 +0000 (20:41 +0000)]
am
ee1b0bfd: am
9714cbdf: am
21627274: am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
ee1b0bfd640641c3b75f751568ead18720ddb60c':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:41:54 +0000 (20:41 +0000)]
am
1746de33: am
bcc83d01: am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
1746de33894b8f9a20e14338908f82df9a699d82':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:41:49 +0000 (20:41 +0000)]
am
76a6dfaf: am
e53c32a0: am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
76a6dfafa1c18078450f1af46d28636c74f8964c':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:39:28 +0000 (20:39 +0000)]
am
65e3350c: am
916277e4: am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
65e3350cd241bb2e087459291051131bfe4c09ad':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:39:24 +0000 (20:39 +0000)]
am
9bc3bde7: am
5e5c9833: am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
9bc3bde793f1e2413a222e9ca12f1049f3df87d4':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:39:19 +0000 (20:39 +0000)]
am
9714cbdf: am
21627274: am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
9714cbdf4aaa303e8b85faae022eefe83996e29e':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:39:14 +0000 (20:39 +0000)]
am
bcc83d01: am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
bcc83d01966dac7fb1d9ac45ae119ad44ee2c471':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:39:09 +0000 (20:39 +0000)]
am
e53c32a0: am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
e53c32a0aa6ccb1bd177ff3fa3335c5b58ca5919':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:35:29 +0000 (12:35 -0800)]
am
916277e4: am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
916277e415e6c8186b79dfe929114d36f80d9ee0':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:35:24 +0000 (12:35 -0800)]
am
5e5c9833: am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
5e5c9833f533bb55964c7e981feacf191b63f09f':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:35:18 +0000 (12:35 -0800)]
am
21627274: am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
21627274a0b1ddbf68599a3b5fe4bfa751885ddf':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:35:14 +0000 (12:35 -0800)]
am
7c865524: am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
7c865524048695f5dc471e6a357a142cf60495a7':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:35:08 +0000 (12:35 -0800)]
am
c61e6bc6: am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
c61e6bc613db3d0d5ce7661bda3fe51ecc2f9726':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:32:08 +0000 (20:32 +0000)]
am
e7eb5996: Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
* commit '
e7eb5996c2cca421eb7d28325918db18044fe4f7':
docs: Removed stray link. Bug:
11773486
quddusc [Tue, 14 Jan 2014 20:32:04 +0000 (20:32 +0000)]
am
cec51d66: Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
* commit '
cec51d6620c1e46c8e4b52f492ff4ed6d75b85a6':
docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762
quddusc [Tue, 14 Jan 2014 20:32:00 +0000 (20:32 +0000)]
am
cc29a170: Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
* commit '
cc29a17056e4ae656182bf2fb36536b25ab4fcae':
docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515
quddusc [Tue, 14 Jan 2014 20:31:55 +0000 (20:31 +0000)]
am
64231d01: Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
* commit '
64231d01dead59752ff230570cbe07f206d5c9ec':
docs: Fixed typo in IAB training doc. Bug:
10807741
quddusc [Tue, 14 Jan 2014 20:31:51 +0000 (20:31 +0000)]
am
72159ab0: Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
* commit '
72159ab085c48f4451ccf44a436e8b2122716fd4':
docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251
quddusc [Tue, 14 Jan 2014 20:30:03 +0000 (20:30 +0000)]
Merge "docs: Removed stray link. Bug:
11773486" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:46 +0000 (20:29 +0000)]
Merge "docs: This change removes the previous (obsolete) instructions to register and sign up for the v1 Maps API, and adds a link to instructions for getting a v2 API key. Bug:
10797762" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:28 +0000 (20:29 +0000)]
Merge "docs: Added missing links pointing to parent containers for <meta-data> manifest element. Bug:
11797515" into klp-docs
quddusc [Tue, 14 Jan 2014 20:29:13 +0000 (20:29 +0000)]
Merge "docs: Fixed typo in IAB training doc. Bug:
10807741" into klp-docs
quddusc [Tue, 14 Jan 2014 20:28:55 +0000 (20:28 +0000)]
Merge "docs: Fixed declarations for ArrayList<String> variables in the IAB V3 code snippets. Bug:
9316251" into klp-docs
John Spurlock [Tue, 14 Jan 2014 20:00:42 +0000 (20:00 +0000)]
am
cce06eda: am
b3436359: am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
cce06eda6bd6af957b261f66eb8ea3623fe09caf':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:57:02 +0000 (19:57 +0000)]
am
b3436359: am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
b34363590953e4efd70168cdf03386d1e469a548':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:54:25 +0000 (11:54 -0800)]
am
e05190ea: am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
e05190eae74be57dd517bb5afbccf901543329bf':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:50:38 +0000 (19:50 +0000)]
am
85f98508: Merge "Docfixes: three typos and escape */*." into klp-docs
* commit '
85f98508366e8422f71553d2a5e682eb804c7419':
Docfixes: three typos and escape */*.
John Spurlock [Tue, 14 Jan 2014 19:48:12 +0000 (19:48 +0000)]
Merge "Docfixes: three typos and escape */*." into klp-docs
quddusc [Sat, 21 Dec 2013 00:26:23 +0000 (16:26 -0800)]
docs: Added link to in-app billing testing API guide and removed misleading statement.
Bug:
9436754
Change-Id: I7f08fbbd6c917a84ad1634ee956cd9c5112d3715
Ricardo Cervera [Tue, 14 Jan 2014 17:47:04 +0000 (17:47 +0000)]
am
82ec0954: am
afe90d80: am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
82ec09547423f7166e271226825ddd686cbab8cb':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:43:25 +0000 (17:43 +0000)]
am
afe90d80: am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
afe90d80563bf6e236f7be6d6312f269a1919cb8':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:39:29 +0000 (09:39 -0800)]
am
7dde7879: am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
7dde7879a4561a3ec9ffc48921a4d074e40aa74e':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:36:07 +0000 (17:36 +0000)]
am
1a21c16b: Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
* commit '
1a21c16b2bd74c022d6b83177027b78992dc42b5':
docs: Fixed typo in AlertDialog code snippet.
Ricardo Cervera [Tue, 14 Jan 2014 17:34:21 +0000 (17:34 +0000)]
Merge "docs: Fixed typo in AlertDialog code snippet." into klp-docs
Marco Nelissen [Tue, 14 Jan 2014 16:21:43 +0000 (16:21 +0000)]
am
e2c046fe: am
13249411: am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
e2c046fe7c5eefb49f710bc417d54448c133cc93':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:18:02 +0000 (16:18 +0000)]
am
13249411: am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
13249411b1c7dd4a476eec6905998217636a9344':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:15:13 +0000 (08:15 -0800)]
am
a9045d24: am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
a9045d24a73faa6aa1e8ad204a1e14a53711a824':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:11:39 +0000 (08:11 -0800)]
am
337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '
337aa376c09bb97a48afe075b4018f030445534f':
Add NULL check in updateProxyConfig
Marco Nelissen [Tue, 14 Jan 2014 16:08:18 +0000 (16:08 +0000)]
Merge "Add NULL check in updateProxyConfig"
Narayan Kamath [Tue, 14 Jan 2014 10:23:44 +0000 (10:23 +0000)]
am
d34950cf: am
80b0496a: am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
d34950cfc66e258caba14c7ddc553028647898f1':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:20:33 +0000 (10:20 +0000)]
am
80b0496a: am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
80b0496abeb03fe4c5086430218c7e4bcf3773db':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:16:39 +0000 (02:16 -0800)]
am
2db26788: am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
2db26788ab367f08cb5378d77e22e8939e7a28c2':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:13:45 +0000 (02:13 -0800)]
am
e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt.""
* commit '
e71afc2ea72e98c4631e79cad65f678090da87d3':
Revert "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Tue, 14 Jan 2014 10:09:50 +0000 (10:09 +0000)]
Merge "Revert "Hide AssetInputStream.getAssetInt.""
Narayan Kamath [Tue, 14 Jan 2014 10:08:45 +0000 (10:08 +0000)]
Revert "Hide AssetInputStream.getAssetInt."
This reverts commit
842d44ec1765e01f4a37af99cc1935b4d0399758.
Change-Id: I188e49d3651fd4941491c239b6a7c9f475995187
Narayan Kamath [Tue, 14 Jan 2014 09:57:37 +0000 (09:57 +0000)]
am
7f4dd912: am
271b28ac: am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
7f4dd91299051d89e04979ba26ee5c27472f49d4':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:54:33 +0000 (09:54 +0000)]
am
271b28ac: am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
271b28ac3121e8bcc46e15bd15b13bfbc1e1be89':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:51:14 +0000 (01:51 -0800)]
am
80213160: am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
8021316010fb4bd18a29751949eb2cda66199b6e':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:48:37 +0000 (01:48 -0800)]
am
ac8ccc3c: Merge "Hide AssetInputStream.getAssetInt."
* commit '
ac8ccc3c181a27103955b0f7bbf3dddabb0a6305':
Hide AssetInputStream.getAssetInt.
Narayan Kamath [Tue, 14 Jan 2014 09:45:40 +0000 (09:45 +0000)]
Merge "Hide AssetInputStream.getAssetInt."
Narayan Kamath [Fri, 10 Jan 2014 17:32:28 +0000 (17:32 +0000)]
Hide AssetInputStream.getAssetInt.
It returns a pointer to a private data structure, so there's
no sensible use for it. Also, the emergence of 64 bit processors
means that the return value isn't wide enough to represent
values in the native heap.
(cherry picked from commit
f8f09a15a409f373f22aa475bb0defd264088e4f)
Change-Id: I9c9b5bae6db8638e65dda60f924aa3dddd06813a
Wei Wang [Wed, 30 Oct 2013 04:05:37 +0000 (21:05 -0700)]
BLE peripheral mode (3/4): Add peripheral mode API.
Change-Id: Id9d2f566b6d9ed0fffe73b67efad2e3d045360b4
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
Dianne Hackborn [Tue, 14 Jan 2014 01:53:07 +0000 (01:53 +0000)]
am
305c61a1: am
3a8a8ddd: am
8c359bf4: am
c174288d: Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
* commit '
305c61a1c6816549b225719518df5b29a17f0f42':
Fix issue #
12031685: Sticky Service Breakage in Android 4.4.1
Zhihai Xu [Tue, 17 Dec 2013 19:39:20 +0000 (11:39 -0800)]
NPE in BluetoothSocket.write()
If calling connect succeed, we should not see this NPE.
An IOException may happen after call BluetoothSocket.connect.
If you still call write after the IOException,
you will get this NPE.
add NPE protection for possible wrong calling sequence from application,
To make bluetoothSocket more error-tolerant.
bug:
12104154
Change-Id: I7fa4e847b500ca9b9d2a43df432f31a1bb016c0a
OSDN Git Service
