OSDN Git Service
Bill Yi [Fri, 26 Jan 2018 21:05:30 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
28abd94074 -s ours
Change-Id: I94d247f60e399547e4418859a014d2c48ac35674
Bill Yi [Fri, 26 Jan 2018 21:02:47 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
178e861e6e -s ours
Change-Id: I44734403eba503fe12eb094e11998d01e6ebf084
Bill Yi [Fri, 26 Jan 2018 20:59:57 +0000 (20:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9531d0fd0b -s ours
Change-Id: I74d6220a3ec75c941b31cb4bef960dc21aa4bade
TreeHugger Robot [Fri, 26 Jan 2018 20:52:07 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:37 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Fri, 26 Jan 2018 20:50:33 +0000 (20:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
David Brazdil [Fri, 26 Jan 2018 19:39:20 +0000 (19:39 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder" am:
656096516c
am:
47f632d48f
Change-Id: I99148ade6a6fafe63618312c228fbe6372e3b401
Primiano Tucci [Fri, 26 Jan 2018 19:29:31 +0000 (19:29 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd" am:
a946cc9f53
am:
71411b877a
Change-Id: I8c07b8650a508f03352075ac7bd6e7943f6cacb4
David Brazdil [Fri, 26 Jan 2018 19:24:35 +0000 (19:24 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
am:
656096516c
Change-Id: Icfda85f4f80516d6f4141be7ede7d047df6aeecf
Primiano Tucci [Fri, 26 Jan 2018 19:18:24 +0000 (19:18 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
am:
a946cc9f53
Change-Id: Ie7a7071264cb91d26eb380b3155a5ed71667fb46
Chad Brubaker [Fri, 26 Jan 2018 18:52:47 +0000 (18:52 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
am:
7ebe5f0ba1
Change-Id: I39d11196229806e4f1fdb171623d8cd94b1d3fbf
TreeHugger Robot [Fri, 26 Jan 2018 18:40:16 +0000 (18:40 +0000)]
Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c358d2b6dc -s ours
Change-Id: I99e0718b5e031415d04140d76176f569b9576e04
TreeHugger Robot [Fri, 26 Jan 2018 18:28:20 +0000 (18:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 26 Jan 2018 17:04:23 +0000 (09:04 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3b82c404d34ad6d9560e1c8b0e31ff9223394022
David Brazdil [Fri, 26 Jan 2018 16:03:25 +0000 (16:03 +0000)]
Merge "Copy hidden API blacklist/dark greylist into build folder"
Treehugger Robot [Fri, 26 Jan 2018 15:51:57 +0000 (15:51 +0000)]
Merge "DropBoxManager: Allow adding a file using an fd"
Bill Yi [Fri, 26 Jan 2018 15:25:46 +0000 (07:25 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2c25ff050a1cee7b26d5939f98fdb9bc4809141c
Tobias Thierer [Fri, 26 Jan 2018 14:25:41 +0000 (14:25 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API." am:
9f82b6bab5
am:
c4905215cb
Change-Id: I064799b5db75c15bff441e9e35a32f5e89f56c35
Primiano Tucci [Fri, 26 Jan 2018 14:25:18 +0000 (14:25 +0000)]
DropBoxManager: Allow adding a file using an fd
This patch adds an overload to DropBoxManager::addFile() which accepts
an already-opened file as a file descriptor. This avoids the need for
clients to create a filesystem-visible file when uploading data to
DropBox.
Test: Tested with perfetto using https://android-review.googlesource.com/c/platform/external/perfetto/+/587674
Change-Id: I076bfd3180fb9b4baff7e1bae2e611419061b2a7
Merged-In: I076bfd3180fb9b4baff7e1bae2e611419061b2a7
Tobias Thierer [Fri, 26 Jan 2018 14:18:44 +0000 (14:18 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
am:
9f82b6bab5
Change-Id: I8cc8b609a02e5059bcda111a416d47d7272c4e3b
David Srbecky [Fri, 26 Jan 2018 14:05:12 +0000 (14:05 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART" am:
418a96457c
am:
637814eebf
Change-Id: I0ecf4d2d1922cfe9948936ef3e494f0a71e6c2f5
David Srbecky [Fri, 26 Jan 2018 13:59:35 +0000 (13:59 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
am:
418a96457c
Change-Id: Ife46a3f6e1c5ad33e7830df0c74a6cbd674f8032
Tobias Thierer [Fri, 26 Jan 2018 13:05:06 +0000 (13:05 +0000)]
Merge "Track removal of Os.waitpid(..., Int32Ref, ...) from API."
David Srbecky [Fri, 26 Jan 2018 12:37:48 +0000 (12:37 +0000)]
Merge "Add dalvik.vm.minidebuginfo property for ART"
Bill Yi [Fri, 26 Jan 2018 12:15:30 +0000 (04:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I61de32231eba5d425f9bd9e7f752173a32855659
David Brazdil [Fri, 26 Jan 2018 11:13:35 +0000 (11:13 +0000)]
Copy hidden API blacklist/dark greylist into build folder
This change is meant for ART buildbots which build against a pinned
commit of the framework and thus do not have the commit which
introduced hidden API lists. Normal builds will now copy the blacklist
and dark greylist into the build folder first, and then generate the
light greylist as usual. If a buildbot does not have the framework
changes, it can create dummy API lists in the build folder before
starting the build and avoid the issue.
Test: make
Bug:
64382372
Change-Id: Ib6e53a45bcc917abb4ba67fdcbf01d4a19c2d56f
Andreas Gampe [Fri, 26 Jan 2018 06:05:51 +0000 (06:05 +0000)]
Merge "Watchdog: Add statsd to interesting processes" am:
8e8c9664ae
am:
6b0c805328
Change-Id: I7efcb364d6678ac80ef3e5e32794fbc5ffbe2a73
Andreas Gampe [Fri, 26 Jan 2018 05:57:39 +0000 (05:57 +0000)]
Merge "Watchdog: Add statsd to interesting processes"
am:
8e8c9664ae
Change-Id: I2dc9515e9205ced55bcddc2b0d83ac0105bc48f4
Treehugger Robot [Fri, 26 Jan 2018 03:52:14 +0000 (03:52 +0000)]
Merge "Watchdog: Add statsd to interesting processes"
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 03:37:01 +0000 (03:37 +0000)]
Merge "Add Voice / Data network specific reg states." am:
ffdbbc533c
am:
e5932b56bc
Change-Id: I07c6aedf87c6800e9cce247b07aaf3d17162ea2b
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 03:29:53 +0000 (03:29 +0000)]
Merge "Add Voice / Data network specific reg states."
am:
ffdbbc533c
Change-Id: I28d44f657a60ec0f823524c3b5107bc3f4808bb1
Tobias Thierer [Fri, 26 Jan 2018 02:09:36 +0000 (02:09 +0000)]
Merge "Deprecate android.util.Mutable*." am:
71a9e66d4a
am:
708034e951
Change-Id: I903140fbb0a3635d7502943274377f99529b52a7
Tobias Thierer [Fri, 26 Jan 2018 02:03:33 +0000 (02:03 +0000)]
Merge "Deprecate android.util.Mutable*."
am:
71a9e66d4a
Change-Id: Ib82f53cac275d084851251c44b6860bfb282373d
Bill Yi [Fri, 26 Jan 2018 01:41:18 +0000 (17:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I8df35af92728aafd2a1ee302e9f5c3a2386f5b6b
Ruchi Kandoi [Fri, 26 Jan 2018 01:18:49 +0000 (01:18 +0000)]
Merge "Open Mobile API for frameworks/base" am:
183865f3e1
am:
ab8328c047
Change-Id: I55279ea7f83de285df54f7a01257230268c253f0
Ruchi Kandoi [Fri, 26 Jan 2018 01:13:45 +0000 (01:13 +0000)]
Merge "Open Mobile API for frameworks/base"
am:
183865f3e1
Change-Id: I96804d1c8e75a6d9d1475438a1753f54e07d0b8a
Xiangyu/Malcolm Chen [Fri, 26 Jan 2018 00:41:27 +0000 (00:41 +0000)]
Merge "Add Voice / Data network specific reg states."
Treehugger Robot [Fri, 26 Jan 2018 00:28:52 +0000 (00:28 +0000)]
Merge "Deprecate android.util.Mutable*."
Android Build Merger (Role) [Thu, 25 Jan 2018 23:34:38 +0000 (23:34 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51 am:
e15cb623db -s ours am:
8289005e10 -s ours
am:
e158633931 -s ours
Change-Id: Ifc1f97d02ebcb063626c7a2b731c1be16916064f
Android Build Merger (Role) [Thu, 25 Jan 2018 23:33:35 +0000 (23:33 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399 am:
7e0d93a69b -s ours am:
dba446b7a3 -s ours
am:
fd1f0742b7 -s ours
Change-Id: I37e9454080f4ed4766ccfd69594106ee48a64638
Android Build Merger (Role) [Thu, 25 Jan 2018 23:32:22 +0000 (23:32 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef am:
0e2501decd -s ours am:
f03288d9f2 -s ours
am:
81666bea7f -s ours
Change-Id: I0a46b477cb406d54a404faa37c121fc8f7de0e1d
Android Build Merger (Role) [Thu, 25 Jan 2018 23:31:12 +0000 (23:31 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev am:
dbdfba9546 -s ours am:
dbbffc9bd6 -s ours
am:
3a09b4e748 -s ours
Change-Id: I709ad494550215037ca532d902c2935c7f22efb1
Ruchi Kandoi [Thu, 25 Jan 2018 23:30:50 +0000 (23:30 +0000)]
Merge "Open Mobile API for frameworks/base"
Android Build Merger (Role) [Thu, 25 Jan 2018 23:29:49 +0000 (23:29 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d am:
6866408a78 -s ours am:
abad95933a -s ours
am:
106209572e -s ours
Change-Id: Ic6e35cc2b54e9d7b9e8642839780e174b233de2d
Android Build Merger (Role) [Thu, 25 Jan 2018 23:24:52 +0000 (23:24 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev am:
066be5e6e1 am:
6981d14838
am:
8b1d663a52
Change-Id: I4c09d6a137a6fbaa0c945556d8ae9496f8bd7b81
Android Build Merger (Role) [Thu, 25 Jan 2018 23:19:27 +0000 (23:19 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d am:
5cd687505a -s ours am:
77803cc4fa -s ours
am:
4f65db7421 -s ours
Change-Id: Ia39df9681739abb613a586c02b72c103868befa0
Android Build Merger (Role) [Thu, 25 Jan 2018 23:17:31 +0000 (23:17 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb am:
350fc5d06a -s ours am:
02ee278871 -s ours
am:
1e9b3172bc -s ours
Change-Id: Idd53800a33435dcff27f6bc904349560dea039cd
Android Build Merger (Role) [Thu, 25 Jan 2018 23:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev am:
11c37d01f7 am:
e72f06b29b
am:
b7cd649409
Change-Id: Ia143af5bd7d0428697039726dfe661e40d5b4fab
Android Build Merger (Role) [Thu, 25 Jan 2018 23:11:49 +0000 (23:11 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5 am:
6f59280206 -s ours am:
f19c7ab533 -s ours
am:
1860adf0cd -s ours
Change-Id: I834f8a47ed9a76b0efb9b98fdeb3ea779444c1c3
Android Build Merger (Role) [Thu, 25 Jan 2018 23:10:18 +0000 (23:10 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b am:
7b9a09d8d2 -s ours am:
bf2ee3c9dd -s ours
am:
22c5a224c7 -s ours
Change-Id: I55e03b6e57defd4f9ae37fb732e929612e26fce5
Android Build Merger (Role) [Thu, 25 Jan 2018 23:07:53 +0000 (23:07 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev am:
6367f8199d am:
f1d0f9652c
am:
33e2d30f87
Change-Id: I9feb53a57b4d76de983f589d24d4ef03fcd7f2b0
Android Build Merger (Role) [Thu, 25 Jan 2018 23:03:32 +0000 (23:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7 am:
387047a201 -s ours am:
f12ba9fee4 -s ours
am:
3c2c04a47d -s ours
Change-Id: I040121c18d1cc3d6915068e885a62b65d997a530
Android Build Merger (Role) [Thu, 25 Jan 2018 23:02:34 +0000 (23:02 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51 am:
e15cb623db -s ours
am:
8289005e10 -s ours
Change-Id: Idf2c76f87a2ad90f286ae0882c8d718b2b4f5264
Android Build Merger (Role) [Thu, 25 Jan 2018 23:01:22 +0000 (23:01 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev am:
eb9a92f942 am:
939313310b
am:
6a423ee7ce
Change-Id: Ifeab0174b98a7755f246966e6e689d46cdbacdbc
Android Build Merger (Role) [Thu, 25 Jan 2018 23:00:57 +0000 (23:00 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399 am:
7e0d93a69b -s ours
am:
dba446b7a3 -s ours
Change-Id: I6fdd508d07c0d808e6d9a217b880da21ecf92178
Android Build Merger (Role) [Thu, 25 Jan 2018 22:59:26 +0000 (22:59 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef am:
0e2501decd -s ours
am:
f03288d9f2 -s ours
Change-Id: I8cdc2239faba5031d836b9e29673e8b93da57e77
Android Build Merger (Role) [Thu, 25 Jan 2018 22:57:45 +0000 (22:57 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev am:
dbdfba9546 -s ours
am:
dbbffc9bd6 -s ours
Change-Id: I0aadadd28c2fdb9a0190f3b65929c2b8b467079a
Android Build Merger (Role) [Thu, 25 Jan 2018 22:57:14 +0000 (22:57 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199 am:
a9d64326ad -s ours am:
8a35a13afe -s ours
am:
73f06fe35f -s ours
Change-Id: Ie7b7de25c5f5340f37a20d02db6b5a1bb37e781f
Android Build Merger (Role) [Thu, 25 Jan 2018 22:54:55 +0000 (22:54 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d am:
6866408a78 -s ours
am:
abad95933a -s ours
Change-Id: Idf38d6f4b8aa647338e2524e40f3319755b3f680
Android Build Merger (Role) [Thu, 25 Jan 2018 22:53:14 +0000 (22:53 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev am:
066be5e6e1
am:
6981d14838
Change-Id: Icca4a7d217d1bc80c6e109b51b2e54d43ad78684
Android Build Merger (Role) [Thu, 25 Jan 2018 22:47:33 +0000 (22:47 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d am:
5cd687505a -s ours
am:
77803cc4fa -s ours
Change-Id: If1e29e82960702d59818a245d5a4d0e3fc0cef10
Android Build Merger (Role) [Thu, 25 Jan 2018 22:45:48 +0000 (22:45 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb am:
350fc5d06a -s ours
am:
02ee278871 -s ours
Change-Id: Ice440c8517e49f87b42dadfe2a728e65c9a3bcaf
Android Build Merger (Role) [Thu, 25 Jan 2018 22:43:37 +0000 (22:43 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev am:
11c37d01f7
am:
e72f06b29b
Change-Id: I06f2d1af886d01b0cbf3429b5d9e361e4b03fe68
Android Build Merger (Role) [Thu, 25 Jan 2018 22:40:03 +0000 (22:40 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5 am:
6f59280206 -s ours
am:
f19c7ab533 -s ours
Change-Id: I25a06490c9bed46c67d6b8ab7a541015e45086c3
Android Build Merger (Role) [Thu, 25 Jan 2018 22:38:06 +0000 (22:38 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b am:
7b9a09d8d2 -s ours
am:
bf2ee3c9dd -s ours
Change-Id: If22ddf2b413bf74534addcabcb3477097411d542
Android Build Merger (Role) [Thu, 25 Jan 2018 22:37:51 +0000 (22:37 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51
am:
e15cb623db -s ours
Change-Id: If1d3c8b5d25c1faeac56120ebdf23f83863dd60c
Android Build Merger (Role) [Thu, 25 Jan 2018 22:36:14 +0000 (22:36 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399
am:
7e0d93a69b -s ours
Change-Id: Ie4e14d3d017c630cf1ac8ed5f462537f2271259b
Android Build Merger (Role) [Thu, 25 Jan 2018 22:35:48 +0000 (22:35 +0000)]
Merge changes from topic "am-
d53588def0a94e089fd73c9ebe97efe7" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev am:
bcf3392856 am:
0fe900767e am:
5e991b9ef8
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours am:
4dfc160224 -s ours am:
4685af2a89 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:35:27 +0000 (22:35 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev am:
6367f8199d
am:
f1d0f9652c
Change-Id: I423e13a45ec384e625db0b8015c394f88b888ac1
Android Build Merger (Role) [Thu, 25 Jan 2018 22:35:15 +0000 (22:35 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev am:
bcf3392856 am:
0fe900767e
am:
5e991b9ef8
Change-Id: Ia332ea53b0f50bba13caa4e1e86f1d13e67e8121
Android Build Merger (Role) [Thu, 25 Jan 2018 22:34:43 +0000 (22:34 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef
am:
0e2501decd -s ours
Change-Id: I16708e07aa533aaf608e28ebd19e8a0ad9049e04
David Brazdil [Thu, 25 Jan 2018 22:32:28 +0000 (22:32 +0000)]
Merge "Show a warning toast/dialog when an app uses hidden APIs" am:
fbef950d95
am:
d750a7c68c
Change-Id: I9b62537d76e4ceb7ce03ca4de5ccf5a182c4439c
Android Build Merger (Role) [Thu, 25 Jan 2018 22:31:56 +0000 (22:31 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7 am:
387047a201 -s ours
am:
f12ba9fee4 -s ours
Change-Id: I5356cae2b66a847ac9622d4c866c592f8f663ba0
Android Build Merger (Role) [Thu, 25 Jan 2018 22:30:49 +0000 (22:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours am:
4dfc160224 -s ours
am:
4685af2a89 -s ours
Change-Id: I1d757f2124f18a50281f96bb8b579f895dc1f3fb
Android Build Merger (Role) [Thu, 25 Jan 2018 22:28:28 +0000 (22:28 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev am:
a22445abae -s ours" into oc-dev
am:
dbdfba9546 -s ours
Change-Id: Ia18ac187b0f64f03f0327b651b7befd7dd41d3c9
Android Build Merger (Role) [Thu, 25 Jan 2018 22:27:07 +0000 (22:27 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev am:
eb9a92f942
am:
939313310b
Change-Id: I7f444ed85aad3b0eedcab0d537d3e18340d5a506
Android Build Merger (Role) [Thu, 25 Jan 2018 22:26:21 +0000 (22:26 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d
am:
6866408a78 -s ours
Change-Id: I33a4d20f2fad121680ee0e7d6f68135f41d23ae1
Android Build Merger (Role) [Thu, 25 Jan 2018 22:24:12 +0000 (22:24 +0000)]
Merge changes from topic "am-
56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4 am:
94b7fafc69 am:
e977655e31
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours am:
6ccac2ffc3 -s ours
Android Build Merger (Role) [Thu, 25 Jan 2018 22:23:29 +0000 (22:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199 am:
a9d64326ad -s ours
am:
8a35a13afe -s ours
Change-Id: I1df7859e4421fdada6d170ad3a5780ebd359403f
Android Build Merger (Role) [Thu, 25 Jan 2018 22:23:29 +0000 (22:23 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4 am:
94b7fafc69
am:
e977655e31
Change-Id: I7e50ca49c650aca991556f6d99c926633183bd89
Android Build Merger (Role) [Thu, 25 Jan 2018 22:22:47 +0000 (22:22 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev
am:
066be5e6e1
Change-Id: Icd0d4d7eccd19fe58e7523f1be1bf4958e207997
Android Build Merger (Role) [Thu, 25 Jan 2018 22:20:40 +0000 (22:20 +0000)]
Merge "Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d am:
5ba62a2194" into oc-mr1-dev-plus-aosp
Hugo Benichi [Thu, 25 Jan 2018 22:19:53 +0000 (22:19 +0000)]
Merge "Tcp socket metrics: implement INetdEventListener callback" am:
93b1787a3d
am:
5ba62a2194
Change-Id: I6c30a47ed35394d63b266250e3525976844b0e8f
Android Build Merger (Role) [Thu, 25 Jan 2018 22:17:14 +0000 (22:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd am:
8eb39fb0f4 -s ours am:
a8e2306430 -s ours
am:
6ccac2ffc3 -s ours
Change-Id: Idf30f2ec1c917c94cdc27959df184713db36bef9
Android Build Merger (Role) [Thu, 25 Jan 2018 22:14:08 +0000 (22:14 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d
am:
5cd687505a -s ours
Change-Id: I08621df252756495257329a271cc6daed40605c5
Android Build Merger (Role) [Thu, 25 Jan 2018 22:13:13 +0000 (22:13 +0000)]
Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 25 Jan 2018 22:12:12 +0000 (22:12 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb
am:
350fc5d06a -s ours
Change-Id: Ibc93567a28a3709b6f97a5cd03cde04a94bac751
Android Build Merger (Role) [Thu, 25 Jan 2018 22:11:40 +0000 (22:11 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev am:
bcf3392856
am:
0fe900767e
Change-Id: I3b62983c0c6eb2bbfbf74739e8d5703ddcd56303
Android Build Merger (Role) [Thu, 25 Jan 2018 22:10:31 +0000 (22:10 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac am:
38508aeaf5
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
Andreas Gampe [Thu, 25 Jan 2018 22:10:27 +0000 (22:10 +0000)]
Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98
am:
ebc0afd811
Change-Id: Ie8b991014a43ca4fba83aeab3ba826996d2813df
Chad Brubaker [Sun, 24 Dec 2017 04:06:44 +0000 (20:06 -0800)]
Relax Instant Apps Settings whitelist enforcement
The strict whitelist of settings for Instant Apps is leading to too much
unintended breakage, remove the enforcement until better infrastructure
can be added to make sure settings that should be whitelisted are.
Bug:
71009655
Test: Coming in a follow up
(cherry picked from commit
b6108d621002d4de708ae526e7c2bc95dabef080)
Change-Id: Iaa1d71331407cee86c10105c1e5668ffd0c925a1
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:51 +0000 (22:08 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac
am:
38508aeaf5
Change-Id: Icf34d805cfd9274e1d00dd35b4db8afa1356742b
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:45 +0000 (22:08 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev
am:
11c37d01f7
Change-Id: I82f397e11e5d0beae8ec218db6e5e4a511feb720
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:03 +0000 (22:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707 am:
d7b199be9a -s ours
am:
4dfc160224 -s ours
Change-Id: I9f96ce4c677fafd32b612735089d3ae97d8fa16b
Android Build Merger (Role) [Thu, 25 Jan 2018 22:07:40 +0000 (22:07 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5
am:
6f59280206 -s ours
Change-Id: Ibd4542deee4166251cc2f97eb0b42e6181681050
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:06:08 +0000 (22:06 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2
am:
d143bb628a
Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
Android Build Merger (Role) [Thu, 25 Jan 2018 22:04:58 +0000 (22:04 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev am:
f310c792d4
am:
94b7fafc69
Change-Id: Id25852c4f17eb92cf9bda17a5670bcb104ca0f78
Android Build Merger (Role) [Thu, 25 Jan 2018 22:04:22 +0000 (22:04 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b
am:
7b9a09d8d2 -s ours
Change-Id: I55b4283893453ef46897b4bf8aaee7a389c7ae12
Android Build Merger (Role) [Thu, 25 Jan 2018 22:02:48 +0000 (22:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours
am:
ea52aec628 -s ours
Change-Id: I3afa944070a378a25dd38551cfd02e397ec7f298
OSDN Git Service
