OSDN Git Service
smain@google.com [Wed, 12 Nov 2014 17:44:52 +0000 (17:44 +0000)]
am
f9c4f6b5: Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
* commit '
f9c4f6b56e1392a411e2996a2bf372873ebf14da':
fix code type and mention api level 21 exception for bindService()
Renato Mangini [Wed, 12 Nov 2014 17:44:48 +0000 (17:44 +0000)]
am
4b7b68d8: Add "notification" category for samples.
* commit '
4b7b68d824ee8bf184f6bfb05f75c74c129a9f8e':
Add "notification" category for samples.
smain@google.com [Wed, 12 Nov 2014 17:41:35 +0000 (17:41 +0000)]
Merge "fix code type and mention api level 21 exception for bindService()" into lmp-docs
smain@google.com [Wed, 12 Nov 2014 17:32:16 +0000 (09:32 -0800)]
fix code type and mention api level 21 exception for bindService()
Change-Id: I45460a1559960a32818e9cc88b1241b26f2f1f7d
Renato Mangini [Wed, 12 Nov 2014 03:51:53 +0000 (19:51 -0800)]
Add "notification" category for samples.
Bug:
18323953
Change-Id: Ifb78015604fd203baaf5f4c6496a86aa6c831227
Deepanshu Gupta [Tue, 11 Nov 2014 17:11:22 +0000 (17:11 +0000)]
Merge "Don't skip loading object animator." into lmp-dev
Deepanshu Gupta [Tue, 11 Nov 2014 15:21:19 +0000 (15:21 +0000)]
Don't skip loading object animator.
This is used by Buttons as part of StateListAnimator.
Change-Id: Id370869e71898d46e11bbd17ad31169c9f9f5274
Eric Laurent [Tue, 11 Nov 2014 01:34:45 +0000 (01:34 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant automerge:
8db769d
automerge:
9e0ed1c
* commit '
9e0ed1c2d67bc2ec74e24782f3738889fa0d79d2':
Eric Laurent [Tue, 11 Nov 2014 00:22:33 +0000 (00:22 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
automerge:
8db769d
* commit '
8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:38:23 +0000 (23:38 +0000)]
am
8db769dd: am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
8db769dd56822a59f1997a9cb53ed02d3d1cb8dd':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:33:52 +0000 (23:33 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
df878bd3fc63f26e91b055e39ba63c53c14b31a0':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:29:07 +0000 (23:29 +0000)]
am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
ced2f74ac170439231f189e31538b9f403909966':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:24:02 +0000 (23:24 +0000)]
am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
e8c1a97fa33797df528265b6f0b0c2c39ac2c589':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:20:06 +0000 (23:20 +0000)]
am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
3b92fc04700a68dab3c3c4a873535837c4e51e8b':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:11:00 +0000 (23:11 +0000)]
am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
AudioEffect JNI: use new max preprocessing constant
Joe Fernandez [Mon, 10 Nov 2014 22:55:20 +0000 (22:55 +0000)]
am
c2f2a725: Merge "docs:builds tools 21.1.1 update" into lmp-docs
* commit '
c2f2a72571a485671f36e9d5b5c1fd9e788c11cd':
docs:builds tools 21.1.1 update
Joe Fernandez [Mon, 10 Nov 2014 22:50:16 +0000 (22:50 +0000)]
Merge "docs:builds tools 21.1.1 update" into lmp-docs
Dirk Dougherty [Mon, 10 Nov 2014 22:11:54 +0000 (22:11 +0000)]
am
602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
* commit '
602c63f8405466dab18b6bbd93eb682900cf459f':
Add Nexus 6 and Nexus 9 to the device framer.
Deepanshu Gupta [Mon, 10 Nov 2014 20:28:40 +0000 (20:28 +0000)]
Merge "Fix setting styles in custom views." into lmp-dev
Deepanshu Gupta [Mon, 10 Nov 2014 20:10:55 +0000 (20:10 +0000)]
Fix setting styles in custom views.
Bug: http://b.android.com/78842
Change-Id: I5d4571d94d96b00419acc258c9e2b519367b689d
Dirk Dougherty [Mon, 10 Nov 2014 19:45:16 +0000 (19:45 +0000)]
Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs
Eric Laurent [Wed, 5 Nov 2014 20:18:05 +0000 (12:18 -0800)]
AudioEffect JNI: use new max preprocessing constant
Bug:
18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit
b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
Deepanshu Gupta [Mon, 10 Nov 2014 18:58:27 +0000 (18:58 +0000)]
Merge "Add primitive shadows support to LayoutLib" into lmp-dev
Deepanshu Gupta [Mon, 10 Nov 2014 18:54:19 +0000 (18:54 +0000)]
Merge "Remove needlessly thrown IOException." into lmp-dev
Rich Slogar [Mon, 10 Nov 2014 17:56:48 +0000 (09:56 -0800)]
docs:builds tools 21.1.1 update
Change-Id: I96fd6ad0926414664b192ca41d13f49f25365e4a
Ricardo Cervera [Mon, 10 Nov 2014 16:42:20 +0000 (16:42 +0000)]
am
e627b94c: Merge "docs: Material design shadow fixes." into lmp-docs
* commit '
e627b94c76ad144abb0207efcdc6b1cb3855bc14':
docs: Material design shadow fixes.
Ricardo Cervera [Mon, 10 Nov 2014 16:36:20 +0000 (16:36 +0000)]
Merge "docs: Material design shadow fixes." into lmp-docs
Ricardo Cervera [Fri, 7 Nov 2014 23:40:06 +0000 (15:40 -0800)]
docs: Material design shadow fixes.
Bug:
18294964
Change-Id: I7abb298c3de71b8d8905cbe476c40223234f2c2f
Deepanshu Gupta [Wed, 5 Nov 2014 02:19:55 +0000 (18:19 -0800)]
Add primitive shadows support to LayoutLib
The shadows rendered are not the same as rendered by the framework. The
main purpose of the shadows here is let the user know when shadows will
be cast.
Currently rectangular shadows are available in only two intensities. Any
elevation below 10dp uses one shadow and any elevation over 10 dp uses
the other.
Also, even though the code for arbitrary shapes exist, it doesn't quite
work yet. No shadows are visible when that code is run.
Change-Id: Ie8235ffccf1d3809713f5d8f82afde434817d6b2
Ricardo Cervera [Fri, 7 Nov 2014 18:30:57 +0000 (18:30 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs automerge:
58dc8c4
automerge:
c9ad13a
* commit '
c9ad13a5e18a6eea512547cba6530cb1eb6a9da8':
Tom Taylor [Fri, 7 Nov 2014 18:29:25 +0000 (18:29 +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 automerge:
6209d4e
automerge:
739117f
* commit '
739117f1a1f70168461a61219b02a90118641e05':
Tom Taylor [Fri, 7 Nov 2014 18:27:57 +0000 (18:27 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge:
db864e4
automerge:
89f7eca
* commit '
89f7eca148869850fd5d107acbbb33a0a555fcd6':
Ricardo Cervera [Fri, 7 Nov 2014 17:49:58 +0000 (17:49 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
automerge:
58dc8c4
* commit '
58dc8c42f2880b4264bfad46b9ab443576d4b4f2':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Winson Chung [Fri, 7 Nov 2014 17:30:55 +0000 (17:30 +0000)]
Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)" into lmp-dev
Quddus Chong [Fri, 7 Nov 2014 02:52:28 +0000 (02:52 +0000)]
am
871aff9c: Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075" into lmp-docs
* commit '
871aff9ca6654ee17e1cfb6d76b987dd3d552bba':
docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075
Quddus Chong [Fri, 7 Nov 2014 01:11:32 +0000 (01:11 +0000)]
Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug:
18181075" into lmp-docs
Winson Chung [Wed, 5 Nov 2014 21:41:12 +0000 (13:41 -0800)]
Increasing the min swipe thresholds for the nav bar gestures. (Bug
17109581)
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit
559e6d34b4e76ee21dc6e300681c399ed735a964)
Luan Nguyen [Fri, 7 Nov 2014 00:05:20 +0000 (00:05 +0000)]
am
712c7ea3: Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
* commit '
712c7ea3d87be2afb7ecaf0d87ea9f9eb1a0007c':
cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4
Joe Fernandez [Fri, 7 Nov 2014 00:05:16 +0000 (00:05 +0000)]
am
1d295821: docs: fix for Brand inquiries form
* commit '
1d295821355c6a1ffcb01866e38664343570129e':
docs: fix for Brand inquiries form
Andres Morales [Thu, 6 Nov 2014 23:50:56 +0000 (23:50 +0000)]
Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
Andres Morales [Tue, 4 Nov 2014 22:56:16 +0000 (14:56 -0800)]
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
Requires less memory pressure to start killing cached
processes.
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
Luan Nguyen [Thu, 6 Nov 2014 23:26:51 +0000 (23:26 +0000)]
Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
Joe Fernandez [Thu, 6 Nov 2014 22:53:04 +0000 (14:53 -0800)]
docs: fix for Brand inquiries form
b/
18162023
Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
Rich Slogar [Thu, 6 Nov 2014 20:33:30 +0000 (20:33 +0000)]
am
b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
* commit '
b0af6987aacec95b90c655f7e9bd9576baaab3df':
docs:Remove tools/index.jd file.
Rich Slogar [Thu, 6 Nov 2014 20:30:10 +0000 (20:30 +0000)]
Merge "docs:Remove tools/index.jd file." into lmp-docs
Deepanshu Gupta [Mon, 3 Nov 2014 23:52:51 +0000 (15:52 -0800)]
Remove needlessly thrown IOException.
Change-Id: If34986367554c98f96f6f9a1088f5e25077a1be1
Quddus Chong [Thu, 6 Nov 2014 19:29:38 +0000 (11:29 -0800)]
docs: Removed statement that ART does not implement compacting garbage collection.
bug:
18181075
Change-Id: Ibbb20604595a6740d19ec1d887854d60fb9d797b
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 13:59:39 +0000 (13:59 +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
automerge:
6209d4e
* commit '
6209d4e4d8a8662628c53cd5e1944abf30293d87':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Wed, 5 Nov 2014 13:58:33 +0000 (13:58 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
automerge:
db864e4
* commit '
db864e4ddc788a21db6793bbcb5f559131f20736':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
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':
OSDN Git Service
