Ricardo Cervera
578e205d97
am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4
...
automerge: c9ad13a
* commit 'c9ad13a5e18a6eea512547cba6530cb1eb6a9da8':
2014-11-07 18:30:57 +00:00
Tom Taylor
d1290de2aa
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':
2014-11-07 18:29:25 +00:00
Tom Taylor
1764db5bf2
am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager automerge: db864e4
...
automerge: 89f7eca
* commit '89f7eca148869850fd5d107acbbb33a0a555fcd6':
2014-11-07 18:27:57 +00:00
Ricardo Cervera
c9ad13a5e1
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
2014-11-07 17:49:58 +00:00
Winson Chung
4ad2c5ba9b
Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-dev
2014-11-07 17:30:58 +00:00
Quddus Chong
0d7fa2fdd9
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
2014-11-07 02:52:28 +00:00
Quddus Chong
871aff9ca6
Merge "docs: Removed statement that ART does not implement compacting garbage collection. bug: 18181075" into lmp-docs
2014-11-07 01:11:33 +00:00
Winson Chung
2763095c13
Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
...
Change-Id: I1bcf6f91f616890f0e815db33267c5230ae9c76f
(cherry picked from commit 559e6d34b4e76ee21dc6e300681c399ed735a964)
2014-11-07 01:10:03 +00:00
Luan Nguyen
816b93cf23
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
2014-11-07 00:05:20 +00:00
Joe Fernandez
d00ce6c537
am 1d295821: docs: fix for Brand inquiries form
...
* commit '1d295821355c6a1ffcb01866e38664343570129e':
docs: fix for Brand inquiries form
2014-11-07 00:05:16 +00:00
Andres Morales
b1477d11ca
Merge "[DO NOT MERGE] Increase min free levels for cached processes on 64bit" into lmp-dev
2014-11-06 23:51:00 +00:00
Andres Morales
423c44dc91
[DO NOT MERGE] Increase min free levels for cached processes on 64bit
...
Requires less memory pressure to start killing cached
processes.
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f
2014-11-06 15:44:02 -08:00
Luan Nguyen
712c7ea3d8
Merge "cherrypick from klp-modular-docs docs: make fixes to Wear training material Change-Id: I27c2c754a027f7202a6388a60008ad3a594132c4" into lmp-docs
2014-11-06 23:26:53 +00:00
Joe Fernandez
1d29582135
docs: fix for Brand inquiries form
...
b/18162023
Change-Id: Iaf8a82bf268fb1c798c90012928641bd2961f4df
2014-11-06 14:53:04 -08:00
Rich Slogar
830790baf8
am b0af6987: Merge "docs:Remove tools/index.jd file." into lmp-docs
...
* commit 'b0af6987aacec95b90c655f7e9bd9576baaab3df':
docs:Remove tools/index.jd file.
2014-11-06 20:33:30 +00:00
Rich Slogar
b0af6987aa
Merge "docs:Remove tools/index.jd file." into lmp-docs
2014-11-06 20:30:11 +00:00
Deepanshu Gupta
9173c8a2e9
Remove needlessly thrown IOException.
...
Change-Id: If34986367554c98f96f6f9a1088f5e25077a1be1
2014-11-06 11:43:37 -08:00
Quddus Chong
01ca1277b9
docs: Removed statement that ART does not implement compacting garbage collection.
...
bug: 18181075
Change-Id: Ibbb20604595a6740d19ec1d887854d60fb9d797b
2014-11-06 11:31:54 -08:00
Ricardo Cervera
b4a1919816
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
2014-11-06 17:13:58 +00:00
Paul Lawrence
afb6b50e82
Merge "DO NOT MERGE: Don't log passwords returned from vdc" into lmp-dev
2014-11-06 17:08:27 +00:00
Ricardo Cervera
58dc8c42f2
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
2014-11-06 17:03:00 +00:00
Ricardo Cervera
9bc1b15a66
am cc0753b0: docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
...
* commit 'cc0753b077abb1ad5e5e95885567261b35067ed4':
docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
2014-11-06 17:02:56 +00:00
Ricardo Cervera
cc0753b077
docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200
...
Change-Id: I4fed30061daabfb05b24e84bb36cd21d38ad0fea
(cherry picked from commit 2871e05b48f0b932885986322ce01212717a6399)
2014-11-06 16:57:50 +00:00
Ricardo Cervera
e7cd5f2e9c
Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs
2014-11-06 16:57:14 +00:00
Dirk Dougherty
f15017fc0a
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.
2014-11-06 05:20:29 +00:00
Dirk Dougherty
326c70efee
Doc change: Add play dev guide page with index card and shareable download.
...
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
(cherry picked from commit 0ce73219be7f37170eb19dba690a5cd8d3e22e21)
2014-11-06 04:37:34 +00:00
Dirk Dougherty
d7476cf42f
Merge "Doc change: Add play dev guide page with index card and shareable download." into lmp-dev
2014-11-06 04:22:11 +00:00
Joe Fernandez
ab6e9048eb
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
2014-11-06 04:14:26 +00:00
Dirk Dougherty
0ce73219be
Doc change: Add play dev guide page with index card and shareable download.
...
Change-Id: I08f5c2a6b863ecb747c90d677f635fab511d91d3
2014-11-05 20:14:15 -08:00
Paul Lawrence
70c9a06af0
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
2014-11-05 19:07:57 -08:00
Joe Fernandez
2490ec8370
Merge "docs: Add more information for getting started with TV app" into lmp-docs
2014-11-06 01:31:56 +00:00
Joe Fernandez
9fe42219c6
docs: Add more information for getting started with TV app
...
- required manifest entries
- more information on permissions that imply hardware features
Change-Id: I55454ba8725185094bef35b9be653d50b58c8137
2014-11-05 17:29:31 -08:00
Dirk Dougherty
b2fe15f9bf
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.
2014-11-05 22:51:31 +00:00
Dirk Dougherty
662964511f
Merge "Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices." into lmp-docs
2014-11-05 22:44:23 +00:00
Dirk Dougherty
df4c4ac540
Doc change: update behavior changes and move to separate doc. Add nogotofail to SSL best practices.
...
Change-Id: Ib4c0b0d442b1ef879cb01b3972845ef93360c5b8
2014-11-05 14:08:58 -08:00
John Spurlock
66c46c4a92
am 3a9321d4: Docs: Fix typo in Preference android:order attribute.
...
* commit '3a9321d407f71fa6c2a49db63e6eb30003c8ef4c':
Docs: Fix typo in Preference android:order attribute.
2014-11-05 21:36:13 +00:00
John Spurlock
3a9321d407
Docs: Fix typo in Preference android:order attribute.
...
Change-Id: Ib3a009ed1fba8396be1bd5055f4897b0cc7d8738
2014-11-05 21:20:36 +00:00
Rich Slogar
848d912505
am 1afa82dc: docs:remove sdk/ndk note
...
* commit '1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
docs:remove sdk/ndk note
2014-11-05 20:13:35 +00:00
Andrew Solovay
56576838a8
am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
...
* commit 'd9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
docs: Removed broken link to non-existent method.
2014-11-05 18:47:17 +00:00
Ricardo Cervera
b4125d1e0b
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.
2014-11-05 18:47:13 +00:00
Rich Slogar
1afa82dce0
docs:remove sdk/ndk note
...
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
2014-11-05 10:46:50 -08:00
Andrew Solovay
d9ceae8f97
Merge "docs: Removed broken link to non-existent method." into lmp-docs
2014-11-05 18:14:05 +00:00
Ricardo Cervera
58f1200c33
Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
2014-11-05 17:00:10 +00:00
Ricardo Cervera
25a4e21e13
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
2014-11-05 16:58:23 +00:00
Tom Taylor
739117f1a1
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
2014-11-05 13:59:39 +00:00
Tom Taylor
89f7eca148
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
2014-11-05 13:58:33 +00:00
Tom Taylor
4e9851183d
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
2014-11-05 04:21:07 +00:00
Tom Taylor
f2f59e7ab9
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
2014-11-05 04:20:11 +00:00
Eric Gilmore
4f82acd810
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.
2014-11-05 00:12:16 +00:00
Eric Gilmore
bf78adb25e
Adding 5.0 emulator image and removing older image.
...
2nd patch set includes low/high res. images.
Bug: 18026943
Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c
2014-11-04 15:01:24 -08:00
