Andreas Gampe
e1cf90c6eb
Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92" into stage-aosp-master
2016-06-16 20:59:43 +00:00
Yi Kong
6635de0108
Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92
...
(cherry picked from commit ade5c7c893
2016-06-16 20:52:17 +00:00
Przemyslaw Szczepaniak
9f4ad4fbb6
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
...
test-current.txt update
Bug: 28666126
(cherry picked from commit aa021e854e
2016-06-16 20:51:23 +00:00
Yi Kong
f5bdd8eae6
Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\"
...
am: 1850851670
2016-06-16 17:02:37 +00:00
Dan Willemsen
5f551b3fdc
resolve merge conflicts of 20d55a7 to stage-aosp-master
...
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
2016-06-16 09:54:28 -07:00
Yi Kong
1850851670
Merge "Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92"
2016-06-16 16:16:00 +00:00
Treehugger Robot
20d55a7779
Merge "Remove unused link to libcutils"
2016-06-16 15:56:50 +00:00
Yi Kong
af823e0ebf
Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92
...
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
2016-06-16 14:29:41 +01:00
Fredrik Roubert
438dc91a41
Merge \"API updated for ICU4J 57.1\"
...
am: 4861329f57
2016-06-16 13:03:50 +00:00
Joachim Sauer
4861329f57
Merge "API updated for ICU4J 57.1"
2016-06-16 12:38:30 +00:00
Przemyslaw Szczepaniak
d37e23c50c
Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
...
am: 47ef3bf172
2016-06-16 12:33:21 +00:00
Przemyslaw Szczepaniak
47ef3bf172
Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"
2016-06-16 12:26:51 +00:00
Przemyslaw Szczepaniak
a82f0622f1
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
...
Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20
2016-06-16 13:07:31 +01:00
Dan Willemsen
9b3bc98425
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
2016-06-15 21:14:28 -07:00
David Gross
403aa6e3ec
Merge \"Delete simple reduction implementation.\"
...
am: e8909dc0f4
2016-06-15 21:11:19 +00:00
David Gross
e8909dc0f4
Merge "Delete simple reduction implementation."
2016-06-15 18:44:04 +00:00
David Gross
11ec90971f
Delete simple reduction implementation.
...
Bug: 27298560
Change-Id: I8a89c9df753d12ee8af06008d424e77bb916cd8f
(cherry picked from commit 4a4578530a
2016-06-14 14:30:06 -07:00
qingxi
bd012f68ac
Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev
...
am: 130db7715a
2016-06-14 17:15:41 +00:00
Qingxi Li
130db7715a
Merge "Add a key for setting carrier's CDMA roaming mode" into nyc-dev
2016-06-14 17:02:53 +00:00
Selim Cinek
844d178c2e
Merge \"Fixed a bug with a legacy notification API\" into nyc-dev
...
am: 05e19bba37
2016-06-14 17:02:39 +00:00
Selim Cinek
05e19bba37
Merge "Fixed a bug with a legacy notification API" into nyc-dev
2016-06-14 16:54:21 +00:00
Bert McMeen
8e0ead3128
Merge \\\"Docs: Watch face performance update\\\" into mnc-io-docs am: 99677fb42d am: 106af82850
...
am: 22eb26c27d
2016-06-14 15:21:58 +00:00
Bert McMeen
22eb26c27d
Merge \\"Docs: Watch face performance update\\" into mnc-io-docs am: 99677fb42d
...
am: 106af82850
2016-06-14 15:15:59 +00:00
Bert McMeen
106af82850
Merge \"Docs: Watch face performance update\" into mnc-io-docs
...
am: 99677fb42d
2016-06-14 15:07:53 +00:00
Bert McMeen
99677fb42d
Merge "Docs: Watch face performance update" into mnc-io-docs
2016-06-14 15:02:01 +00:00
John Reck
f22f6cf0f3
Merge \"Redraw if dirty during stopped when resumed\" into nyc-dev
...
am: 5b4ff21a74
2016-06-14 14:54:21 +00:00
John Reck
5b4ff21a74
Merge "Redraw if dirty during stopped when resumed" into nyc-dev
2016-06-14 14:43:20 +00:00
Fredrik Roubert
0af16f3d36
API updated for ICU4J 57.1
...
Bug: 27819846
Change-Id: I891853397ac1f4de58fd0687e7cab27bd270ac64
2016-06-14 15:03:51 +02:00
Bill Yi
933d21c9ea
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 7ce75172dd
2016-06-14 12:21:19 +00:00
Bill Yi
2ff4926362
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: bb8b32262f
2016-06-14 12:06:34 +00:00
TreeHugger Robot
7ce75172dd
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-14 11:47:54 +00:00
TreeHugger Robot
bb8b32262f
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-14 11:46:43 +00:00
Paul Jensen
a73132f89d
Merge \"Show sign-in to network notification to all users, not just owner.\" into nyc-dev
...
am: 78452db285
2016-06-14 11:16:15 +00:00
Paul Jensen
78452db285
Merge "Show sign-in to network notification to all users, not just owner." into nyc-dev
2016-06-14 11:05:32 +00:00
Bill Yi
829614d3ac
Import translations. DO NOT MERGE
...
Change-Id: I4aafe42447a82d42a1b3c013f046a4a264dafcc4
Auto-generated-cl: translation import
2016-06-13 23:26:51 -07:00
Bill Yi
7ff69e9597
Import translations. DO NOT MERGE
...
Change-Id: Ied2403cbd3d46b70771f137bd4b5aab6fb7150b5
Auto-generated-cl: translation import
2016-06-13 22:58:21 -07:00
Tomasz Mikolajewski
be6e44cdfa
Merge \"Make CotentResolver#openInputStream handle errors from reliable pipes.\" into nyc-dev
...
am: ac3fe8fffe
2016-06-14 04:24:44 +00:00
Tomasz Mikolajewski
ac3fe8fffe
Merge "Make CotentResolver#openInputStream handle errors from reliable pipes." into nyc-dev
2016-06-14 04:15:26 +00:00
Kevin Hufnagle
ec9470fb55
Merge \"docs: Expanded description of \"Key Attestation\" N Preview feature.\" into nyc-dev
...
am: f6250cc7df
2016-06-14 03:04:40 +00:00
Kevin Hufnagle
f6250cc7df
Merge "docs: Expanded description of "Key Attestation" N Preview feature." into nyc-dev
2016-06-14 02:53:30 +00:00
Joe Fernandez
75e0c4d1a3
Merge \"docs: Add Videos section to N Preview landing page\" into nyc-dev
...
am: e335ccdc00
2016-06-14 01:25:44 +00:00
Aurimas Liutikas
5bdd762928
Merge \\\"Fix a spelling error in Supporting Languages page.\\\" into mnc-io-docs am: ab239a0c1a am: 5699312627
...
am: a53fc1f2c0
2016-06-14 01:17:03 +00:00
Aurimas Liutikas
18fdb53359
Merge \\\"Swap fill_parent with match_parent in best practices doc.\\\" into mnc-io-docs am: df4528fbe8 am: 1729c75f73
...
am: 8bf5f6c851
2016-06-14 01:16:58 +00:00
Aurimas Liutikas
0ea3ffd6c1
Merge \\\"Correct parentActivity example in Activity Element docs.\\\" into mnc-io-docs am: 893413e50c am: ce2e9d8716
...
am: 3f1741a19c
2016-06-14 01:16:53 +00:00
Joe Fernandez
e335ccdc00
Merge "docs: Add Videos section to N Preview landing page" into nyc-dev
2016-06-14 01:13:26 +00:00
Joe Fernandez
a1f02ff4e4
docs: Add Videos section to N Preview landing page
...
b/29215717
Change-Id: I0bcd995a0a458e7624d1e8a689cb3eb249f9397d
2016-06-13 18:10:12 -07:00
Aurimas Liutikas
a53fc1f2c0
Merge \\"Fix a spelling error in Supporting Languages page.\\" into mnc-io-docs am: ab239a0c1a
...
am: 5699312627
2016-06-14 00:57:28 +00:00
Aurimas Liutikas
8bf5f6c851
Merge \\"Swap fill_parent with match_parent in best practices doc.\\" into mnc-io-docs am: df4528fbe8
...
am: 1729c75f73
2016-06-14 00:57:24 +00:00
Aurimas Liutikas
3f1741a19c
Merge \\"Correct parentActivity example in Activity Element docs.\\" into mnc-io-docs am: 893413e50c
...
am: ce2e9d8716
2016-06-14 00:57:18 +00:00
Chad Brubaker
66bd9229dd
Merge \"Use NoPreloadHolder for certificate sources\" into nyc-dev
...
am: c738e48ed6
2016-06-14 00:49:25 +00:00
