OSDN Git Service
Ricardo Cervera [Thu, 20 Nov 2014 19:49:52 +0000 (19:49 +0000)]
Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev
Andrew Solovay [Thu, 20 Nov 2014 01:32:30 +0000 (01:32 +0000)]
am
05282133: Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs
* commit '
05282133c7491fd2b5e8f3da05408ff0165df526':
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
Andrew Solovay [Thu, 20 Nov 2014 01:27:49 +0000 (01:27 +0000)]
Merge "docs: Bugfix & minor cleanup for "Providing Messaging for Auto"" into lmp-docs
Elliott Hughes [Thu, 20 Nov 2014 01:21:40 +0000 (01:21 +0000)]
am
6c43e6b5: Fix and be more explicit about plurals best practices.
* commit '
6c43e6b54d7d540e579d2dff8c9cff981cb5ca4a':
Fix and be more explicit about plurals best practices.
Elliott Hughes [Fri, 23 May 2014 20:28:33 +0000 (13:28 -0700)]
Fix and be more explicit about plurals best practices.
The "one" case should always include %d. Say so, and fix our examples.
Also make it clear that developers should always provide exactly "one"
and "other".
Bug:
18429565
(cherry picked from commit
1fe7d496db1ddc73289e6aae11f4dd4a970141d5)
Change-Id: I89656c74b7dfd91584e1bb6d0a3f2da1dda81079
Dirk Dougherty [Thu, 20 Nov 2014 00:02:06 +0000 (00:02 +0000)]
am
a79acc03: Doc change: localized content.
* commit '
a79acc0315d33080527b9fb48ba063fb4104de37':
Doc change: localized content.
Dirk Dougherty [Sat, 15 Nov 2014 03:19:18 +0000 (19:19 -0800)]
Doc change: localized content.
Change-Id: I5440fe8d6003bdd8e3cb4c44bacea422f322c33b
smain@google.com [Wed, 19 Nov 2014 23:10:06 +0000 (23:10 +0000)]
am
2411fe88: Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
* commit '
2411fe88d7b11f628e5338bd8f314c98a9d45bb4':
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
smain@google.com [Wed, 19 Nov 2014 23:06:25 +0000 (23:06 +0000)]
Merge "add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes" into lmp-docs
Quddus Chong [Wed, 19 Nov 2014 22:58:30 +0000 (22:58 +0000)]
am
9b822b96: docs: Added link to CarExtender class from Auto Getting Started doc.
* commit '
9b822b96aaf16ac4ad8e5a1c8da998fba2f3f404':
docs: Added link to CarExtender class from Auto Getting Started doc.
Andrew Solovay [Wed, 19 Nov 2014 18:41:04 +0000 (10:41 -0800)]
docs: Bugfix & minor cleanup for "Providing Messaging for Auto"
Fixeds the gradle dependency line. Also added in Javadoc links for the
various support classes and methods, and other minor cleanup. See
first comment for doc stage location.
bug:
18439090
Change-Id: I7ccc892f38a644d68abc6d56d8d4377df5f864b0
Deepanshu Gupta [Wed, 19 Nov 2014 22:30:17 +0000 (22:30 +0000)]
Merge "Fix setTextAppearance for styles with dots." into lmp-dev
Deepanshu Gupta [Wed, 19 Nov 2014 22:29:52 +0000 (22:29 +0000)]
Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
Geoffrey Borggaard [Wed, 19 Nov 2014 19:56:46 +0000 (19:56 +0000)]
Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev
Quddus Chong [Wed, 19 Nov 2014 19:26:09 +0000 (11:26 -0800)]
docs: Added link to CarExtender class from Auto Getting Started doc.
Change-Id: Ia446c969a7108d8964c22958cd501b083a84b9d3
Geoffrey Borggaard [Wed, 19 Nov 2014 19:22:56 +0000 (14:22 -0500)]
Setting ADB_ENABLED may result in a SecurityException.
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug:
18433477
Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
xinhe [Wed, 19 Nov 2014 17:47:23 +0000 (17:47 +0000)]
Merge "Add configuration to control converting sms destination number" into lmp-dev
xinhe [Wed, 19 Nov 2014 01:09:54 +0000 (17:09 -0800)]
Add configuration to control converting sms destination number
Romove hard codes about the SimcardOperatorList and NetworkOperatorList.
Bug:
18081228
Change-Id: I0d96972c6097325634413137bfbdb5a246885276
Ricardo Cervera [Tue, 18 Nov 2014 23:21:29 +0000 (23:21 +0000)]
am
0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
* commit '
0d18b091eb5bb5be6f7142821b674e1648158a11':
docs: Add link to "Voice search in your app" video.
Ricardo Cervera [Tue, 18 Nov 2014 23:16:20 +0000 (23:16 +0000)]
Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
Deepanshu Gupta [Tue, 18 Nov 2014 22:44:00 +0000 (22:44 +0000)]
Fix setTextAppearance for styles with dots.
Bug: http://b.android.com/78842
Change-Id: I65923134b2d3812030e2b7dd8ab96363b0647c1f
Quddus Chong [Tue, 18 Nov 2014 22:08:10 +0000 (22:08 +0000)]
am
4741fb4b: docs: Fixed bugs for Auto docs.
* commit '
4741fb4bb146909fc133ae37ea43dbb7f9edbd04':
docs: Fixed bugs for Auto docs.
Deepanshu Gupta [Tue, 18 Nov 2014 21:53:47 +0000 (21:53 +0000)]
LayoutLib: Stub AM/PM keycodes in Time Picker.
TimePickerSpinnerDelegate doesn't need to deal with input when running
inside LayoutLib. So, we just return the keycodes as if it's running in
English locale.
Bug: http://b.android.com/79189
Change-Id: Ife0ae91a1e34a8dac379bc1dda1c1c8ed461c164
Quddus Chong [Tue, 18 Nov 2014 17:32:16 +0000 (09:32 -0800)]
docs: Fixed bugs for Auto docs.
Change-Id: Iba8406a95374e5c621eb607c6bb0a8ad6a892f59
smain@google.com [Tue, 18 Nov 2014 20:47:43 +0000 (12:47 -0800)]
add the helpouts widget and necessary tags to "wave 2" of the Getting Started classes
Change-Id: I79d5193d9a4d466d22f495d8685bb43a42d5c3fa
Ricardo Cervera [Tue, 18 Nov 2014 18:02:15 +0000 (10:02 -0800)]
docs: Add link to "Voice search in your app" video.
Bug:
18407660
Change-Id: I9062c708b64586116e5af4df5d83b73988189e8a
Selim Cinek [Wed, 12 Nov 2014 16:53:52 +0000 (17:53 +0100)]
Increases the falsing threshold when for the keyguard affordances
The minimum amount has been increased by 20dp and in addition the
Motion is cancelled whenever a POINTER_DOWN occurs, which should
help a lot with falsing.
Bug:
18298401
Change-Id: I04b1f30fd2555c08209224f4e84c610ecd7a33f1
(cherry picked from commit
1dc406505cdcbbf98ece4f15a2f98f621e24abdb)
Andrew Solovay [Tue, 18 Nov 2014 10:17:53 +0000 (10:17 +0000)]
am
a7f226b8: docs: (Preview) Building an Android Messaging App guide.
* commit '
a7f226b860455b26cc64f6db08f8c279be71117f':
docs: (Preview) Building an Android Messaging App guide.
Andrew Solovay [Thu, 13 Nov 2014 06:27:01 +0000 (22:27 -0800)]
docs: (Preview) Building an Android Messaging App guide.
See the first comment for doc staging location.
Change-Id: Ibfa0f43abefbdd03c5468186b2ec0c76ed6c9ade
Andrew Solovay [Tue, 18 Nov 2014 08:59:15 +0000 (08:59 +0000)]
am
7fe755e6: docs: (Preview) Building Android Audio Playback Apps guide.
* commit '
7fe755e66b10244da2382c11f9244346b8184e48':
docs: (Preview) Building Android Audio Playback Apps guide.
Andrew Solovay [Thu, 13 Nov 2014 07:33:37 +0000 (23:33 -0800)]
docs: (Preview) Building Android Audio Playback Apps guide.
Doc was previously titled "Building Android Media Apps"; per request,
changed "Media" to "Audio" whenever possible, and moved file location
accordingly.
See the comment after patch set 5 for the updated staging location.
Change-Id: I0d657851d44b46cdfb1b5806a51dad0565312c04
Quddus Chong [Tue, 18 Nov 2014 08:31:31 +0000 (08:31 +0000)]
am
c6aed461: docs: Added developer docs for Android Auto 11/18 release.
* commit '
c6aed4612827be0359d2022f6a38a0e5fce0609c':
docs: Added developer docs for Android Auto 11/18 release.
Quddus Chong [Tue, 11 Nov 2014 02:50:17 +0000 (18:50 -0800)]
docs: Added developer docs for Android Auto 11/18 release.
Change-Id: I2e3a2010f3b40f81c56dde9f710284cd2332217c
Eric Gilmore [Tue, 18 Nov 2014 05:36:42 +0000 (05:36 +0000)]
am
343c4193: Merge "Adding app quality criteria." into lmp-docs
* commit '
343c4193c0a1974e996eecdcab8d70cdcd4184a0':
Adding app quality criteria.
Eric Gilmore [Tue, 18 Nov 2014 05:30:54 +0000 (05:30 +0000)]
Merge "Adding app quality criteria." into lmp-docs
Eric Gilmore [Tue, 11 Nov 2014 22:55:46 +0000 (14:55 -0800)]
Adding app quality criteria.
Change-Id: Id4b9f0632642b9fd3a4312ec3bc61136a6043436
Ricardo Cervera-Navarro [Mon, 17 Nov 2014 19:14:40 +0000 (19:14 +0000)]
am
5b11c51d: Merge "docs:eclipse-migrate update" into lmp-docs
* commit '
5b11c51d87ad99d0ccad6bf8b3d1bd4f626e5f48':
docs:eclipse-migrate update
Ricardo Cervera-Navarro [Mon, 17 Nov 2014 19:07:02 +0000 (19:07 +0000)]
Merge "docs:eclipse-migrate update" into lmp-docs
smain@google.com [Fri, 14 Nov 2014 18:53:39 +0000 (18:53 +0000)]
am
5e5af93b: remove preview system image links bug:
18376658
* commit '
5e5af93b962c5ec97f7c2b841d4e9076904dd544':
remove preview system image links bug:
18376658
smain@google.com [Fri, 14 Nov 2014 18:12:53 +0000 (10:12 -0800)]
remove preview system image links
bug:
18376658
Change-Id: I5f0e79e4261a004a84a09c0095d77f985abdf868
Sarah Maddox [Fri, 14 Nov 2014 00:02:38 +0000 (00:02 +0000)]
am
67b0ac71: Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
* commit '
67b0ac719a87ba52c849a6cf055ef235f230dd6e':
docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length.
Sarah Maddox [Thu, 13 Nov 2014 23:57:29 +0000 (23:57 +0000)]
Merge "docs: Clarifies the difference between the Android framework location APIs and the Google Play services location APIs. Fixes 80-character line length." into lmp-docs
kmccormick [Thu, 13 Nov 2014 22:24:44 +0000 (22:24 +0000)]
am
feb1347b: Merge "Doc update: new reg error code + snippet" into lmp-docs
* commit '
feb1347b2b411be03c640e8d61bfc3b428932e31':
Doc update: new reg error code + snippet
kmccormick [Thu, 13 Nov 2014 22:21:01 +0000 (22:21 +0000)]
Merge "Doc update: new reg error code + snippet" into lmp-docs
Renato Mangini [Thu, 13 Nov 2014 03:54:11 +0000 (03:54 +0000)]
am
c9fc837f: Add new samples to what\'s new page.
* commit '
c9fc837fb3d866484a8ed3e61f2ba551f76af66b':
Add new samples to what's new page.
Renato Mangini [Thu, 13 Nov 2014 02:55:06 +0000 (18:55 -0800)]
Add new samples to what's new page.
Also reverted the order on the page to show most recent samples first.
Bug:
18323953
Change-Id: I79b01fa71547f4a7d843f52bdd1853dd8fbe54a8
Sarah Maddox [Tue, 11 Nov 2014 22:21:41 +0000 (09:21 +1100)]
docs: Clarifies the difference between the Android framework location APIs
and the Google Play services location APIs.
Fixes 80-character line length.
Bug:
18080006
Change-Id: I463e0bfe47e9113af2ce4e03806d25e082a9b285
Renato Mangini [Wed, 12 Nov 2014 23:33:47 +0000 (23:33 +0000)]
am
1b657d92: Fix the order of sample categories left nav.
* commit '
1b657d924301d1caa132797f2ab397ba48429e6b':
Fix the order of sample categories left nav.
Renato Mangini [Wed, 12 Nov 2014 22:07:48 +0000 (14:07 -0800)]
Fix the order of sample categories left nav.
Bug:
18323953
Change-Id: Iea882fed74428d092c02e3cfcf2171c4c596b8a8
Jeff Sharkey [Wed, 12 Nov 2014 20:18:11 +0000 (12:18 -0800)]
Recover apps with malformed certificates.
There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle. The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.
A related libcore change (
0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.
This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.
Bug:
18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
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
kmccormick [Mon, 10 Nov 2014 22:03:01 +0000 (14:03 -0800)]
Doc update: new reg error code + snippet
Change-Id: Ie8df1cc68ebe5a2a6589d34f16e554e36dca546e
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 [Mon, 20 Oct 2014 21:29:42 +0000 (14:29 -0700)]
docs: Fixes to the Data Layer Wear class.
Bug:
17917638
Bug:
17917145
Bug:
17931937
Bug:
17933032
Bug:
16899307
Change-Id: Iee9fd0a44cd40b9860cf242cbdaabac409882a15
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
OSDN Git Service
