OSDN Git Service
Android Build Merger (Role) [Wed, 31 Jan 2018 11:21:07 +0000 (11:21 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab am:
6b1b3c9bdc
Change-Id: Iceaaaec271c590da862e65002396222aab9219e8
Android Build Merger (Role) [Wed, 31 Jan 2018 11:21:02 +0000 (11:21 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96 am:
54f1b302ab
Change-Id: I09260b353e45dac4c59b920b0166d40b3eb810aa
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:55 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac am:
885a2ecf96
Change-Id: Ie23e4a58c906b1afe4e47e915251d44c628c9a72
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:48 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3 am:
7341805cac
Change-Id: Ib4cb67450dcb8e35693030d77e2ec815d23275d1
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:41 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
Change-Id: Ieddabe1b12f34bd7632ce893ef4e0c298f5c44df
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:28 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
Change-Id: Ia7b1157fb7f2066e26dc82ec703f39cd9fa69fd7
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:21 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:15 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:08 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
Change-Id: Ic336b5fafebabdd4a5ad4d775a96d76739189a09
Android Build Merger (Role) [Wed, 31 Jan 2018 11:19:56 +0000 (11:19 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Change-Id: I20336a5786e753e6941b9a784068480475415110
Adam Vartanian [Wed, 31 Jan 2018 11:05:10 +0000 (11:05 +0000)]
Adjust URI host parsing to stop on \ character.
The WHATWG URL parsing algorithm [1] used by browsers says that for
"special" URL schemes (which is basically all commonly-used
hierarchical schemes, including http, https, ftp, and file), the host
portion ends if a \ character is seen, whereas this class previously
continued to consider characters part of the hostname. This meant
that a malicious URL could be seen as having a "safe" host when viewed
by an app but navigate to a different host when passed to a browser.
[1] https://url.spec.whatwg.org/#host-state
Bug:
71360761
Test: vogar frameworks/base/core/tests/coretests/src/android/net/UriTest.java (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Id53f7054d1be8d59bbcc7e219159e59a2425106e
Android Build Merger (Role) [Thu, 25 Jan 2018 21:48:45 +0000 (21:48 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
41ee2787b4 -s ours skipped:
705235ca51
Change-Id: I57003c4084de0c55b990bdba5e498fb07c0ad937
Bill Yi [Thu, 25 Jan 2018 21:48:06 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
41ee2787b4 -s ours
Change-Id: Ic8c5c22925b1249c6041075cd67967cbbfd3fd21
Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:35 +0000 (21:46 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
407d338837 -s ours skipped:
6ad3912399
Change-Id: Ia0b55c69a3f7f6b576f9fd2faa02866681961587
Bill Yi [Thu, 25 Jan 2018 21:45:40 +0000 (21:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
407d338837 -s ours
Change-Id: Ic2af52ea4156e11d19ae5ded4e86a7163d876903
Android Build Merger (Role) [Thu, 25 Jan 2018 19:23:08 +0000 (19:23 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
16b6bdf5a5 -s ours skipped:
03ed0985ef
Change-Id: I113bf00458f99e58ed965245aff19a7f461ac143
Bill Yi [Thu, 25 Jan 2018 19:22:07 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
16b6bdf5a5 -s ours
Change-Id: Ibcd4c5627e0a7fb62fd32374debbfb4f52bc52d9
Android Build Merger (Role) [Thu, 25 Jan 2018 19:18:06 +0000 (19:18 +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
Android Build Merger (Role) [Thu, 25 Jan 2018 19:17:00 +0000 (19:17 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev
am:
a22445abae -s ours
Change-Id: If06e22ea49de21de8d0243174481425bf6eebe00
Android Build Merger (Role) [Thu, 25 Jan 2018 19:16:41 +0000 (19:16 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
28815c5b0e -s ours skipped:
0534420c5d
Change-Id: Ib28f32367d753392da264d786ead51b438ea92ef
Bill Yi [Thu, 25 Jan 2018 19:15:45 +0000 (19:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
28815c5b0e -s ours
Change-Id: I629a9d1b140dff3fa2f96d28bae37e062879e1d2
Android Build Merger (Role) [Thu, 25 Jan 2018 19:14:36 +0000 (19:14 +0000)]
Merge "Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev am:
2d947206f7" into oc-dev
Android Build Merger (Role) [Thu, 25 Jan 2018 19:13:58 +0000 (19:13 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev
am:
2d947206f7
Change-Id: I2c2aae1e6ec927843fa15241c4dbbffed1039cb7
Android Build Merger (Role) [Thu, 25 Jan 2018 19:13:04 +0000 (19:13 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
d6df52e22f -s ours skipped:
7f649e7e6d
Change-Id: I6fbe4b2b677e6a16f1c98491b3dcf7b748fc6fd5
Bill Yi [Thu, 25 Jan 2018 19:12:11 +0000 (19:12 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
d6df52e22f -s ours
Change-Id: I69117be7b79ef4765d9390b34c0101141ba7831a
Android Build Merger (Role) [Thu, 25 Jan 2018 19:05:59 +0000 (19:05 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours" into nyc-mr2-dev
Android Build Merger (Role) [Thu, 25 Jan 2018 19:05:35 +0000 (19:05 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1d77757fb5 -s ours skipped:
d855899adb
Change-Id: I62b87e383181de48f322c74b9ee2a71c2d353b92
Bill Yi [Thu, 25 Jan 2018 19:04:46 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1d77757fb5 -s ours
Change-Id: I7e07b391f3af5df8b4077fe3c1c357cb14afcc18
TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 19:04:37 +0000 (19:04 +0000)]
Merge changes from topic "am-
cfa86bae-47ed-4c92-b3ac-
8400ba6eb201" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582
Import translations. DO NOT MERGE
Android Build Merger (Role) [Thu, 25 Jan 2018 18:57:49 +0000 (18:57 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours" into nyc-mr2-dev
Android Build Merger (Role) [Thu, 25 Jan 2018 18:57:23 +0000 (18:57 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0fa3646a34 -s ours skipped:
d6eb3dbf4b
Change-Id: I663a8b386f4809aa08c3f26f6d28014405039490
TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:57:01 +0000 (18:57 +0000)]
Merge changes from topic "am-
8df06f4c-7127-41db-a6a2-
64c67bb75497" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03
Import translations. DO NOT MERGE
Bill Yi [Thu, 25 Jan 2018 18:56:32 +0000 (18:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0fa3646a34 -s ours
Change-Id: Icdd5b7e1f54acae9914fd79949584ce80d5a489c
TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:50:36 +0000 (18:50 +0000)]
Merge changes from topic "am-
8df3bdfc-9f3c-40b2-b051-
5cc0120da88b" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:48:29 +0000 (18:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 25 Jan 2018 18:48:29 +0000 (18:48 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:48:29 +0000 (18:48 +0000)]
Merge changes from topic "am-
37557a04-fa85-46fe-a499-
4a0280811f3e" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:46:43 +0000 (18:46 +0000)]
Merge changes from topic "am-
6a9a8997-43fc-40a2-827f-
5f1c575c8748" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb
Import translations. DO NOT MERGE
Android Build Merger (Role) [Thu, 25 Jan 2018 14:29:03 +0000 (14:29 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb skipped:
2e4c69a707
Change-Id: I6f98cfa7f1bc12306c8e28a234d2b0d011068674
Android Build Merger (Role) [Thu, 25 Jan 2018 14:28:57 +0000 (14:28 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
39a33e2ffb
Change-Id: I817002a824ff75c6764d45d3738518c1603a00ba
Bill Yi [Thu, 25 Jan 2018 14:28:41 +0000 (06:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I80b1d4aea34253fee5f9f16972f84f3821213925
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:13 +0000 (14:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
Change-Id: I4a8b6d977c11f57303700d60526707b632a7c403
Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:07 +0000 (14:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb
Change-Id: Iae0ea1e87448360321f506ca698d19b5b7812498
Bill Yi [Thu, 25 Jan 2018 14:22:37 +0000 (06:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie4fc80ab24fb6a8f3272a6540e6d93d26b7d5496
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 13:30:52 +0000 (13:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7 skipped:
e0e084e199
Change-Id: I13d150895e8888b73cedb9e78e430609bb13bef0
Android Build Merger (Role) [Thu, 25 Jan 2018 13:30:47 +0000 (13:30 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
816ddbdba7
Change-Id: I7914f49de4bd92832326b43b8f87b684bb5df85a
Bill Yi [Thu, 25 Jan 2018 13:30:32 +0000 (05:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib1a557b242a301a3244b7683b4d3203e5551e84c
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 13:24:45 +0000 (13:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03 skipped:
ccc16f92d7
Change-Id: Ibe748c9da6143a7a0421edd05f91209e2513434f
Android Build Merger (Role) [Thu, 25 Jan 2018 13:24:39 +0000 (13:24 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
aa7eca2f03
Change-Id: I5299779ac97c96c9c20707b11006f33403aa61a1
Bill Yi [Thu, 25 Jan 2018 13:24:07 +0000 (05:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I72bd79c6c16dba3db7513f60fec81b9410e25ff5
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:09 +0000 (13:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
Change-Id: Id7171c69c55a042c6ac6cad743a23960591b9e86
Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:01 +0000 (13:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01
Change-Id: I697689c9d02095934f558b3b2ce3786170b25305
Bill Yi [Thu, 25 Jan 2018 13:12:24 +0000 (05:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibd7d5723c9c4cdc09efcb30f604ff43a096c5da1
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 12:41:51 +0000 (12:41 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582 skipped:
1a68c01ae5
Change-Id: Ief9440db0bc052b439ef05840f7e7cc8c8e5cfe1
Android Build Merger (Role) [Thu, 25 Jan 2018 12:41:43 +0000 (12:41 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4f9f892582
Change-Id: I052916ddfb676ce11c96e18a8bd5ffedc9aec5a5
Bill Yi [Thu, 25 Jan 2018 12:41:01 +0000 (04:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7cda19f1d67da8975f8df8372b5a43ff2b54174f
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 12:22:34 +0000 (12:22 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18 skipped:
218841a6dd
Change-Id: Iad2457215210dc2eb9dfbe4224fdf532da6595e2
Android Build Merger (Role) [Thu, 25 Jan 2018 12:22:28 +0000 (12:22 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2c3e611a18
Change-Id: Ie0d7a9db0c88eec27035f319b7ea47f9416caec7
Bill Yi [Thu, 25 Jan 2018 12:22:07 +0000 (04:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I12725f0c3f63da5ac2a809128b7e4d143b113672
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 12:17:01 +0000 (12:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93
Change-Id: I93cffeeef1826f04ff75bd61c9fcacbfcfc8668c
Android Build Merger (Role) [Thu, 25 Jan 2018 12:16:54 +0000 (12:16 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486
Change-Id: I45a61272bb4c3ca3a67210778f6fd7ff65553f99
Bill Yi [Thu, 25 Jan 2018 12:16:22 +0000 (04:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3040ff1778e9dc85cc004396ec70bf272d73c0f5
Auto-generated-cl: translation import
Sunny Goyal [Wed, 1 Nov 2017 18:58:13 +0000 (11:58 -0700)]
RESTRICT AUTOMERGE Preventing recursive referrence in drawables
Bug:
68706673
Bug:
66498711
Test: Added CTS tests
Change-Id: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
(cherry picked from commit I8034f49d16f9a7bc1749714fd6d6231bba5088d0)
Merged-In: I8034f49d16f9a7bc1749714fd6d6231bba5088d0
TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
Kevin Hufnagle [Thu, 29 Jun 2017 22:58:48 +0000 (15:58 -0700)]
Merged-In: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
docs: Revised descriptions of binding and connecting to services.
Clarified that Context.bindService() returning true only indicates
that the system has found a service to bind to the client and that
ServiceConnection.onServiceConnected() might not be called if the
service encounters an error, such as crashing during startup.
Test: make ds-docs
Bug:
63118511
Change-Id: I0906de76abf4124d74f7f4f80ac0eab3cbf94f7e
Bill Yi [Thu, 21 Dec 2017 18:15:02 +0000 (18:15 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
45d962274f -s ours
am:
0a1948e515 -s ours
Change-Id: If6c330da79edb94911ec1fb076a29e8c485ca725
Bill Yi [Thu, 21 Dec 2017 18:11:27 +0000 (18:11 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
45d962274f -s ours
Change-Id: I43d3d8e14417f7aed30a470191386753c9957701
TreeHugger Robot [Thu, 21 Dec 2017 18:04:34 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 21 Dec 2017 17:57:41 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
81b98ffb09 -s ours
am:
ea2e302eff -s ours
Change-Id: I9d23c6267a38545927029782293ef8a15961cca7
Bill Yi [Thu, 21 Dec 2017 17:51:21 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
599fb37c01 -s ours
am:
d21211470c -s ours
Change-Id: Ife7d7f70c599c556abebf10eee525072a127b34d
Bill Yi [Thu, 21 Dec 2017 17:50:03 +0000 (17:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e1ca34b5c7 -s ours
am:
d5a7faea83 -s ours
Change-Id: Ie8542f341e8be8ea5d28f300773c0d49c6a16aab
Bill Yi [Thu, 21 Dec 2017 17:48:29 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
7ce772e941 -s ours
am:
51fc07ad61 -s ours
Change-Id: I336996e228fd3c69f192d3614207f24cec0b4ed8
Bill Yi [Thu, 21 Dec 2017 17:46:04 +0000 (17:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
81b98ffb09 -s ours
Change-Id: I6369ce728c37d066932736566e465f73e7843eb5
Bill Yi [Thu, 21 Dec 2017 17:44:40 +0000 (17:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
599fb37c01 -s ours
Change-Id: Icc605bca96905c647601df651186850c874b5442
Bill Yi [Thu, 21 Dec 2017 17:42:25 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e1ca34b5c7 -s ours
Change-Id: Ie97a72b89d17e982dbe499c26c956dafffe5effa
Bill Yi [Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
1f204cd1ea -s ours
am:
5943ef281a -s ours
Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476
Bill Yi [Thu, 21 Dec 2017 17:41:01 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
7ce772e941 -s ours
Change-Id: I0a8e327692fb18d67b9e724ce3254f3c342206b9
Bill Yi [Thu, 21 Dec 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
970261b46c -s ours
am:
a683975c54 -s ours
Change-Id: I54b9b28c9ad38ad19c1e7f228e2e095dfd5cabe3
TreeHugger Robot [Wed, 20 Dec 2017 23:45:59 +0000 (23:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:55 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:18 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 20 Dec 2017 23:44:11 +0000 (23:44 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 20 Dec 2017 19:29:47 +0000 (19:29 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
1f204cd1ea -s ours
Change-Id: I0f8053bf3d65cd451e704ad682cd54b29953e944
Bill Yi [Wed, 20 Dec 2017 19:26:37 +0000 (19:26 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
9593ca1955 -s ours
am:
7244723549 -s ours
Change-Id: Id717ceb76ced6f3fb2b10689efd916e7e7cc5cfe
Bill Yi [Wed, 20 Dec 2017 19:22:02 +0000 (19:22 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
970261b46c -s ours
Change-Id: I1f37c148c9d2086d198443c596880fbc57cbad4b
Bill Yi [Wed, 20 Dec 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0c1f4c2931 -s ours
am:
2d00ab621a -s ours
Change-Id: Ib3d980494cfeb7ddc621e1185429635cc5b3ab8d
OSDN Git Service
