OSDN Git Service
Bill Yi [Fri, 17 Jun 2016 04:12:45 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 17 Jun 2016 01:58:50 +0000 (18:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I306c97d17e5448007f5ba1bfa0871d585436c061
Bill Yi [Thu, 16 Jun 2016 21:59:43 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Thu, 16 Jun 2016 21:50:43 +0000 (14:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I987370579e491a8a7691748f090d111c93e3a89d
ywen [Thu, 16 Jun 2016 21:42:13 +0000 (21:42 +0000)]
Merge \"Performance Optimization: Align texture dirty rect\"
am:
4e6a73c16a
Change-Id: I2bafdfadd3d6ff88be44475f77158236015acfde
John Reck [Thu, 16 Jun 2016 21:35:12 +0000 (21:35 +0000)]
Merge "Performance Optimization: Align texture dirty rect"
Andreas Gampe [Thu, 16 Jun 2016 20:59:42 +0000 (20:59 +0000)]
Merge "Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92" into stage-aosp-master
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
(cherry picked from commit
ade5c7c8930969b50b6653ab28d87cccbd566547)
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
test-current.txt update
Bug:
28666126
(cherry picked from commit
aa021e854ef84f7a7aff109b5bec824190f9ebfa)
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
Yi Kong [Thu, 16 Jun 2016 17:02:37 +0000 (17:02 +0000)]
Merge \"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\"
am:
1850851670
Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84
Dan Willemsen [Thu, 16 Jun 2016 16:54:28 +0000 (09:54 -0700)]
resolve merge conflicts of
20d55a7 to stage-aosp-master
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
Yi Kong [Thu, 16 Jun 2016 16:16:00 +0000 (16:16 +0000)]
Treehugger Robot [Thu, 16 Jun 2016 15:56:50 +0000 (15:56 +0000)]
Merge "Remove unused link to libcutils"
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
Fredrik Roubert [Thu, 16 Jun 2016 13:03:50 +0000 (13:03 +0000)]
Merge \"API updated for ICU4J 57.1\"
am:
4861329f57
Change-Id: I28a8fe77f81a0cb24ed7044046c06677b44c812c
Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]
Merge "API updated for ICU4J 57.1"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:33:21 +0000 (12:33 +0000)]
Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am:
47ef3bf172
Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:07:31 +0000 (13:07 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Bug:
28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
Dan Willemsen [Wed, 15 Jun 2016 20:56:27 +0000 (13:56 -0700)]
Remove unused link to libcutils
This library is built against the NDK, so it shouldn't be linking to
platform libraries. It should also be pulling <android/log.h> from the
NDK headers, so remove the system/core/include include directory.
Change-Id: Ie9d6514f43492401697907aee4df56bdbf4e1926
David Gross [Wed, 15 Jun 2016 21:11:19 +0000 (21:11 +0000)]
Merge \"Delete simple reduction implementation.\"
am:
e8909dc0f4
Change-Id: I76f07b8fc893ac8b67b131b84e34594b0fd3d9b1
David Gross [Wed, 15 Jun 2016 18:44:03 +0000 (18:44 +0000)]
Merge "Delete simple reduction implementation."
ywen [Mon, 15 Feb 2016 08:09:40 +0000 (16:09 +0800)]
Performance Optimization: Align texture dirty rect
Align x offset and width to 32, y offset and height to 4.
It improves the font texture upload performance.
Change-Id: I967eeed90658f2ce1eb08cb2740d5dc34c72f40b
David Gross [Thu, 2 Jun 2016 21:46:55 +0000 (14:46 -0700)]
Delete simple reduction implementation.
Bug:
27298560
Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f
(cherry picked from commit
4a4578530a1a5fb751ea5a7bfbff83f3ab669895)
qingxi [Tue, 14 Jun 2016 17:15:41 +0000 (17:15 +0000)]
Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
am:
130db7715a
Change-Id: I130ba1362d755e1859d5c22311867008d0626890
Qingxi Li [Tue, 14 Jun 2016 17:02:51 +0000 (17:02 +0000)]
Merge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev
Selim Cinek [Tue, 14 Jun 2016 17:02:39 +0000 (17:02 +0000)]
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
am:
05e19bba37
Change-Id: I419b48b3a4e73b5cc1c7597d885541f4b163a00f
Selim Cinek [Tue, 14 Jun 2016 16:54:20 +0000 (16:54 +0000)]
Merge "Fixed a bug with a legacy notification API" into nyc-dev
Bert McMeen [Tue, 14 Jun 2016 15:21:58 +0000 (15:21 +0000)]
Merge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am:
99677fb42d am:
106af82850
am:
22eb26c27d
Change-Id: Ifd3b004c5401ba7374d642439938849da19060e8
Bert McMeen [Tue, 14 Jun 2016 15:15:59 +0000 (15:15 +0000)]
Merge \\"Docs: Watch face performance update\\" into mnc-io-docs am:
99677fb42d
am:
106af82850
Change-Id: Ia9fa224a4ebb6e51a3c6141751036504d202e137
Bert McMeen [Tue, 14 Jun 2016 15:07:53 +0000 (15:07 +0000)]
Merge \"Docs: Watch face performance update\" into mnc-io-docs
am:
99677fb42d
Change-Id: I41b6ee0628e561cfb7f711d07ac1e41ff71fcb60
Bert McMeen [Tue, 14 Jun 2016 15:01:59 +0000 (15:01 +0000)]
Merge "Docs: Watch face performance update" into mnc-io-docs
John Reck [Tue, 14 Jun 2016 14:54:21 +0000 (14:54 +0000)]
Merge \"Redraw if dirty during stopped when resumed\" into nyc-dev
am:
5b4ff21a74
Change-Id: I75235a18c29939b4f221c8af664d5f7218660aed
John Reck [Tue, 14 Jun 2016 14:43:19 +0000 (14:43 +0000)]
Merge "Redraw if dirty during stopped when resumed" into nyc-dev
Fredrik Roubert [Mon, 13 Jun 2016 12:00:14 +0000 (14:00 +0200)]
API updated for ICU4J 57.1
Bug:
27819846
Change-Id: I891853397ac1f4de58fd0687e7cab27bd270ac64
Bill Yi [Tue, 14 Jun 2016 12:21:19 +0000 (12:21 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
7ce75172dd -s ours
Change-Id: Ie8451e38f89fedd49445ff91b1d01fe93177292b
Bill Yi [Tue, 14 Jun 2016 12:06:34 +0000 (12:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
bb8b32262f -s ours
Change-Id: I711e22ef0d10409d81c1ed4352876697797b95a8
TreeHugger Robot [Tue, 14 Jun 2016 11:47:53 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:46:42 +0000 (11:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Paul Jensen [Tue, 14 Jun 2016 11:16:15 +0000 (11:16 +0000)]
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
am:
78452db285
Change-Id: Ic8f99cb7c7fa7ed1f40c73342840f82c56f9f90f
Paul Jensen [Tue, 14 Jun 2016 11:05:31 +0000 (11:05 +0000)]
Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev
Bill Yi [Tue, 14 Jun 2016 06:26:51 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4aafe42447a82d42a1b3c013f046a4a264dafcc4
Auto-generated-cl: translation import
Bill Yi [Tue, 14 Jun 2016 05:58:21 +0000 (22:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied2403cbd3d46b70771f137bd4b5aab6fb7150b5
Auto-generated-cl: translation import
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:24:44 +0000 (04:24 +0000)]
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
am:
ac3fe8fffe
Change-Id: Ia2caacf5d322b807d29f51bde10b7866023b5de1
Tomasz Mikolajewski [Tue, 14 Jun 2016 04:15:25 +0000 (04:15 +0000)]
Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev
Kevin Hufnagle [Tue, 14 Jun 2016 03:04:40 +0000 (03:04 +0000)]
Merge \"docs: Expanded description of \"Key Attestation\" N Preview feature.\" into nyc-dev
am:
f6250cc7df
Change-Id: Iaa6ddf4ca95d0780c5b5d306680d56126ac6c0b5
Kevin Hufnagle [Tue, 14 Jun 2016 02:53:29 +0000 (02:53 +0000)]
Merge "docs: Expanded description of "Key Attestation" N Preview feature." into nyc-dev
Joe Fernandez [Tue, 14 Jun 2016 01:25:44 +0000 (01:25 +0000)]
Merge \"docs: Add Videos section to N Preview landing page\" into nyc-dev
am:
e335ccdc00
Change-Id: I84dd9b79392333bac2dbd1a7ce947c2c044485b2
Aurimas Liutikas [Tue, 14 Jun 2016 01:17:03 +0000 (01:17 +0000)]
Merge \\\"Fix a spelling error in Supporting Languages page.\\\" into mnc-io-docs am:
ab239a0c1a am:
5699312627
am:
a53fc1f2c0
Change-Id: I7e242b90394992b6f48eb738351f8f016d5e94cb
Aurimas Liutikas [Tue, 14 Jun 2016 01:16:58 +0000 (01:16 +0000)]
Merge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc-io-docs am:
df4528fbe8 am:
1729c75f73
am:
8bf5f6c851
Change-Id: I361068cabbea494480fc20e176a5335d653ee1d6
Aurimas Liutikas [Tue, 14 Jun 2016 01:16:53 +0000 (01:16 +0000)]
Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs am:
893413e50c am:
ce2e9d8716
am:
3f1741a19c
Change-Id: Ib7ecbfec74f43726fdd1c0b935d995c3f57f613d
Joe Fernandez [Tue, 14 Jun 2016 01:13:25 +0000 (01:13 +0000)]
Merge "docs: Add Videos section to N Preview landing page" into nyc-dev
Joe Fernandez [Mon, 13 Jun 2016 17:11:13 +0000 (10:11 -0700)]
docs: Add Videos section to N Preview landing page
b/
29215717
Change-Id: I0bcd995a0a458e7624d1e8a689cb3eb249f9397d
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:28 +0000 (00:57 +0000)]
Merge \\"Fix a spelling error in Supporting Languages page.\\" into mnc-io-docs am:
ab239a0c1a
am:
5699312627
Change-Id: I7e7e4777b0475a7c2dd242370a6900cfd4457f90
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:24 +0000 (00:57 +0000)]
Merge \\"Swap fill_parent with match_parent in best practices doc.\\" into mnc-io-docs am:
df4528fbe8
am:
1729c75f73
Change-Id: I074f24ee54e2ec7005e31a6528f54068c6e1eb3c
Aurimas Liutikas [Tue, 14 Jun 2016 00:57:18 +0000 (00:57 +0000)]
Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io-docs am:
893413e50c
am:
ce2e9d8716
Change-Id: I90462329a4fbdd264714c653b0df30cbc9f4f866
Chad Brubaker [Tue, 14 Jun 2016 00:49:25 +0000 (00:49 +0000)]
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
am:
c738e48ed6
Change-Id: Iae1170534a10b81778e9e1cd3df8e5fca62f7546
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:55 +0000 (00:48 +0000)]
Merge \"Fix a spelling error in Supporting Languages page.\" into mnc-io-docs
am:
ab239a0c1a
Change-Id: I2de3485349f22c1eae990808c81320c8a995430d
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:50 +0000 (00:48 +0000)]
Merge \"Swap fill_parent with match_parent in best practices doc.\" into mnc-io-docs
am:
df4528fbe8
Change-Id: Ie2039cf96c3591b6fc2c0cb8ec1097707edcc76b
Aurimas Liutikas [Tue, 14 Jun 2016 00:48:43 +0000 (00:48 +0000)]
Merge \"Correct parentActivity example in Activity Element docs.\" into mnc-io-docs
am:
893413e50c
Change-Id: I845619909443f9d56bfc7d9f5284b15c2587c5d6
TreeHugger Robot [Tue, 14 Jun 2016 00:35:48 +0000 (00:35 +0000)]
Merge "Use NoPreloadHolder for certificate sources" into nyc-dev
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:52 +0000 (00:33 +0000)]
Merge "Fix a spelling error in Supporting Languages page." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:33:19 +0000 (00:33 +0000)]
Merge "Swap fill_parent with match_parent in best practices doc." into mnc-io-docs
Aurimas Liutikas [Tue, 14 Jun 2016 00:31:46 +0000 (00:31 +0000)]
Merge "Correct parentActivity example in Activity Element docs." into mnc-io-docs
Kevin Hufnagle [Thu, 9 Jun 2016 23:02:31 +0000 (16:02 -0700)]
docs: Expanded description of "Key Attestation" N Preview feature.
The Key Attestation section within the Android N Preview "API
Overview" page now links to a separate page, which contains a
procedure for completing the attestation process, as well as the
certificate schema and its elements' associated descriptions.
Bug:
28851641
Change-Id: If96af7f5e7e6ba9297f48f20c669591b1a9ee9ce
ggfan [Mon, 13 Jun 2016 23:30:53 +0000 (23:30 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo am:
c1755d345d am:
999b7afac8
am:
3c76d062ae
Change-Id: I0609d3492d42e80ca6456128e7a80f78964463d1
ggfan [Mon, 13 Jun 2016 23:21:33 +0000 (23:21 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo am:
c1755d345d
am:
999b7afac8
Change-Id: I7f3c8d7c65373570193fe5fde940698c1eb3f3e9
Dan Willemsen [Mon, 13 Jun 2016 23:17:12 +0000 (23:17 +0000)]
Merge \"CtsShim: Support building with tapas\" into nyc-dev
am:
c47168d592
Change-Id: I2b444c36225693f0755c1b6854c86c17203a9945
ggfan [Mon, 13 Jun 2016 23:12:49 +0000 (23:12 +0000)]
Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo
am:
c1755d345d
Change-Id: I881cd1e70e422267dbe345be525330f18bae4126
Andrew Solovay [Mon, 13 Jun 2016 23:08:39 +0000 (23:08 +0000)]
Merge \"docs: Noted that N Preview doc is available online as of DP4\" into nyc-dev
am:
98d2f591e0
Change-Id: I73b1d551fc865cc54b827bfc62ecb9dc6c95412b
Dan Willemsen [Mon, 13 Jun 2016 23:07:05 +0000 (23:07 +0000)]
Merge "CtsShim: Support building with tapas" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 22:56:54 +0000 (22:56 +0000)]
Merge \"Correclty capitalize Date in status bar panel\" into nyc-dev
am:
366f324113
Change-Id: I2ab3815031d483af53e587e0ff97327cd6ae23b4
TreeHugger Robot [Mon, 13 Jun 2016 22:56:09 +0000 (22:56 +0000)]
Merge "docs: Noted that N Preview doc is available online as of DP4" into nyc-dev
ggfan [Thu, 9 Jun 2016 19:44:01 +0000 (12:44 -0700)]
Update validation-layer.jd for NDK-R12:
use packed layer binaries
punt building layers to Khronos github repo
Change-Id: Icf840de42856d2488a87174b2cd6c604ef8d8770
(cherry picked from commit
f22d094a30c9446abe074b82bb84f6daf51e0534)
Chad Brubaker [Mon, 13 Jun 2016 22:51:40 +0000 (15:51 -0700)]
Use NoPreloadHolder for certificate sources
The static instances of SystemCertificateSource and
UserCertificateSource depend on the current user, avoid triggering their
static initializer when preloaded.
Bug:
29258379
Change-Id: I5088366ae67145b8bc928d6c04118529c82a7fc3
Selim Cinek [Mon, 13 Jun 2016 22:47:03 +0000 (15:47 -0700)]
Fixed a bug with a legacy notification API
When using setLatestEventInfo the icons would not be shown
at all anymore, leading to a crash if they were grouped.
This CL makes sure the smallIcon is always set even for those
legacy apps.
It also fixes the usage of setShow when, as legacy apps wouldn't
have the time anymore.
Change-Id: I2645175b2adabcedbbfec7a502b89d143d2b9bd3
Fixes:
29255365
Fixes:
27430676
Chong Zhang [Mon, 13 Jun 2016 22:43:08 +0000 (22:43 +0000)]
Merge \"Prevent crash from null ApplicationInfo after package is removed.\" into nyc-dev
am:
42edc7c2c2
Change-Id: Ieaef2531a5f4c7bd462917d5c6a12b0095938211
Adrian Roos [Mon, 13 Jun 2016 22:39:50 +0000 (22:39 +0000)]
Merge "Correclty capitalize Date in status bar panel" into nyc-dev
Andrii Kulian [Mon, 13 Jun 2016 22:20:10 +0000 (22:20 +0000)]
Merge \"Don\'t update task to return to type for last task over home\" into nyc-dev
am:
62b08eb5f2
Change-Id: Ibf43a0588feb20e94cc8aaec1193e06e5b3426b4
Adrian Roos [Mon, 13 Jun 2016 22:20:05 +0000 (22:20 +0000)]
Merge \"Add MessagingStyle transitions\" into nyc-dev
am:
a5e2aa99c0
Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a
Andrew Solovay [Mon, 13 Jun 2016 22:19:57 +0000 (22:19 +0000)]
Merge \\\"docs: Corrected method name in multi-window docs\\\" into mnc-io-docs am:
0e68b6b5fc am:
2c0261224a
am:
2cb6ca1892
Change-Id: Ie01897c2a111084dd1cb6162c70abd44852f307a
Makoto Onuki [Mon, 13 Jun 2016 22:17:10 +0000 (22:17 +0000)]
Merge \"Push DO/PO package names from DPMS to PM\" into nyc-dev
am:
f419bd9e03
Change-Id: I27dec65477ddfa90060baeea26169ea79503f642
Jason Monk [Mon, 13 Jun 2016 22:17:07 +0000 (22:17 +0000)]
Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am:
126366dde5
Change-Id: Iba8b3696738f9fc0260311d49d6e98dfcedbc118
Winson [Mon, 13 Jun 2016 22:17:04 +0000 (22:17 +0000)]
Merge \"Ensuring we don\'t try and dismiss task views that are already removed.\" into nyc-dev
am:
c169a9d8a1
Change-Id: I16e8679a30285ca9c1472022348861b759e1aed7
Bert McMeen [Mon, 13 Jun 2016 22:17:00 +0000 (22:17 +0000)]
Docs: Fixed one of the addListener() links am:
33a1ea297d am:
ba86350c63
am:
51487f06f9
Change-Id: I4c0c094dda9ce0313c10c78438252e6174c48bc8
Doris Liu [Mon, 13 Jun 2016 22:16:57 +0000 (22:16 +0000)]
Merge \"Fix setCurrentPlayTime for started but not yet pulsed animations\" into nyc-dev
am:
42d39300cf
Change-Id: Ia7bf744345494bbd13a742f33cb63acbe0ab3315
Chong Zhang [Mon, 13 Jun 2016 22:16:35 +0000 (22:16 +0000)]
Merge "Prevent crash from null ApplicationInfo after package is removed." into nyc-dev
Chong Zhang [Mon, 13 Jun 2016 21:41:41 +0000 (14:41 -0700)]
Prevent crash from null ApplicationInfo after package is removed.
Bug:
29234926
Change-Id: I8c2fed7c7e862e1f6798d5ed535d1937f9a74c1a
Yorke Lee [Mon, 13 Jun 2016 22:14:24 +0000 (22:14 +0000)]
Merge \"Check for detached view in drag-related APIs\" into nyc-dev
am:
cdc9d7bed9
Change-Id: I95d551726913c95d2806fe22ee93fcc24d1862c2
Svetoslav Ganov [Mon, 13 Jun 2016 22:14:09 +0000 (22:14 +0000)]
Merge \"Fix permissions update for VrListenerService on user changes.\" into nyc-dev
am:
d054f4f2fe
Change-Id: I9bacc14760274c9684f0535d59133dfb109bf7a0
ggfan [Mon, 13 Jun 2016 22:13:57 +0000 (22:13 +0000)]
Merge \"Update validation-layer.jd for NDK-R12: use packed layer binaries punt building layers to Khronos github repo\" into nyc-dev
am:
da66010cd8
Change-Id: I918352c3b56e03e9fd5f9cf2696ce363668fbeeb
Jason Monk [Mon, 13 Jun 2016 22:13:43 +0000 (22:13 +0000)]
Merge \"Fix QS edit view accessibility classes\" into nyc-dev
am:
0809964452
Change-Id: I6d4bdd6814951584256d9994d5f88bcafac5edc5
David Gross [Mon, 13 Jun 2016 22:12:48 +0000 (22:12 +0000)]
Merge \"Delete simple reduction implementation.\" into nyc-dev
am:
d749245b88
Change-Id: I28a4e52a41678ecb10b0869566e1cb79d4287b60
Andrii Kulian [Mon, 13 Jun 2016 21:55:46 +0000 (21:55 +0000)]
Merge "Don't update task to return to type for last task over home" into nyc-dev
Adrian Roos [Mon, 13 Jun 2016 21:45:07 +0000 (21:45 +0000)]
Merge "Add MessagingStyle transitions" into nyc-dev
Bert McMeen [Tue, 31 May 2016 23:29:28 +0000 (16:29 -0700)]
Docs: Watch face performance update
Bug:
28923320
Change-Id: Ie1e8f0670bda1a4c975de829a6f27d6d95138ac7
Adrian Roos [Thu, 2 Jun 2016 00:09:45 +0000 (17:09 -0700)]
Add MessagingStyle transitions
Fixes a particularly bad transition in the case where there
is one incoming message to a group.
Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes:
29043489
Andrew Solovay [Mon, 13 Jun 2016 21:24:19 +0000 (21:24 +0000)]
Merge \\"docs: Corrected method name in multi-window docs\\" into mnc-io-docs am:
0e68b6b5fc
am:
2c0261224a
Change-Id: I52a482a04b5a8789d48a5347c9a5fc63010462b6
Andrew Solovay [Mon, 13 Jun 2016 21:17:09 +0000 (21:17 +0000)]
Merge \"docs: Corrected method name in multi-window docs\" into mnc-io-docs
am:
0e68b6b5fc
Change-Id: I93b8a2788eadbfeac3b2d293e42d2cef0a42eae4
Makoto Onuki [Mon, 13 Jun 2016 21:16:28 +0000 (21:16 +0000)]
Merge "Push DO/PO package names from DPMS to PM" into nyc-dev