OSDN Git Service
Bill Yi [Mon, 15 Oct 2018 10:34:58 +0000 (03:34 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
15b8498906 -s ours
Change-Id: I45ebb9332b5aa628d1fd4838642d1ef2083b7ab9
Bill Yi [Mon, 15 Oct 2018 10:33:49 +0000 (03:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
6ae6c7061a -s ours
Change-Id: I4210d8bc6277f12d314675e641fd437dc7bdcf2e
Bill Yi [Mon, 15 Oct 2018 10:32:29 +0000 (03:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
2d0b6317b0 -s ours
Change-Id: Ie9ae5227e1c09e1d4fab3274ebf25be29f4f122d
Bill Yi [Mon, 15 Oct 2018 10:29:39 +0000 (03:29 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
0669310b2b -s ours
Change-Id: I0c05cf9b96fc7d797c5145d2c894d69e098fb2e0
TreeHugger Robot [Mon, 15 Oct 2018 10:25:25 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 10:23:14 +0000 (10:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 10:22:20 +0000 (10:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 10:21:54 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Mon, 15 Oct 2018 07:49:09 +0000 (00:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9adafde1870b4dd3dbe1fa106d5ce493e415a1b9
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 07:33:51 +0000 (00:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I23491eb0f29da573570e464147af17ab2839fd8d
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 05:34:46 +0000 (22:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1867505743cad61f0d2c7722dbfe59efe97d0d3
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 04:37:01 +0000 (21:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
d85b5fa196 -s ours
Change-Id: I380547e0e8f628f6663eb65109d41a34d9fccda1
Bill Yi [Mon, 15 Oct 2018 04:33:00 +0000 (21:33 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
e5b79453f8 -s ours
Change-Id: I730dafe7778ac2f587b3110a1f0db3893b4c9aca
Bill Yi [Mon, 15 Oct 2018 04:31:43 +0000 (21:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
c8685de558 -s ours
Change-Id: Ia329a3bede2227a4d57159d494b27504bd98549a
Bill Yi [Mon, 15 Oct 2018 04:30:35 +0000 (21:30 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
4d5286bcb8 -s ours
Change-Id: I6c830da29d617033421cee020a2eddf7decb4a8b
Bill Yi [Mon, 15 Oct 2018 04:29:25 +0000 (21:29 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
a8c3ce2984 -s ours
Change-Id: I078bc5add74d080d737218eaf694b3a27d5d9c2d
Bill Yi [Mon, 15 Oct 2018 04:28:18 +0000 (21:28 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
15d4997ef9 -s ours
Change-Id: Ib52596858530bbd45b5a7b0140458a1299348316
Bill Yi [Mon, 15 Oct 2018 04:26:58 +0000 (21:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
6a781ba866 -s ours
Change-Id: Idd0b306aa3d756ac3ca5b00db5f07c044fb7595a
Bill Yi [Mon, 15 Oct 2018 04:25:49 +0000 (21:25 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
3db4ae0fbd -s ours
Change-Id: I20a71172cf88b798ede97c1fdfa7f8a51cfe92f3
TreeHugger Robot [Mon, 15 Oct 2018 04:24:08 +0000 (04:24 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 04:13:11 +0000 (04:13 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 04:12:51 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 04:12:05 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 04:12:01 +0000 (04:12 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 04:11:40 +0000 (04:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 04:11:20 +0000 (04:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Mon, 15 Oct 2018 04:09:39 +0000 (04:09 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Mon, 15 Oct 2018 03:58:03 +0000 (20:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icda9b45fef81f60d860ca4fa74fb940a75240fea
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:42:52 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic5bdd5ce441a8ca3c829a8041e3b1b0fac436e5d
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:37:07 +0000 (19:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd12fe880196b27fabec4b480b2792f4b39865bd
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:31:30 +0000 (19:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1465a564d69e38af968dc48adcf4adf06ab0f0a1
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:25:54 +0000 (19:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idefd91212c7a00596027f3109d4d1f6881e5a08e
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:20:06 +0000 (19:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3018993cf2fa01894d53d95af6f9f658b589cabe
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:14:30 +0000 (19:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2350eca9bd75e66ad1d2ff4eead64c6ad96afdc1
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:08:54 +0000 (19:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26ff83b305c63386893a100c132953c0272b8348
Auto-generated-cl: translation import
Bill Yi [Mon, 15 Oct 2018 02:02:45 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I88f796513bcadc6948c08cef6ad505c9d997b288
Auto-generated-cl: translation import
Sundong Ahn [Mon, 15 Oct 2018 01:57:12 +0000 (18:57 -0700)]
Merge "Build com.android.media.remotedisplay with java_sdk_library" am:
1ad4aed0b9
am:
a1bc1b1331
Change-Id: I4fff5350c7ae997f5db3f2e3b88bec8bdbe53d90
Sundong Ahn [Mon, 15 Oct 2018 01:48:01 +0000 (18:48 -0700)]
Merge "Build com.android.media.remotedisplay with java_sdk_library"
am:
1ad4aed0b9
Change-Id: Icb633bd7f8cc0ed932c0aa70ef9dfe475722ada0
Treehugger Robot [Mon, 15 Oct 2018 01:32:16 +0000 (01:32 +0000)]
Merge "Build com.android.media.remotedisplay with java_sdk_library"
Tobias Thierer [Sat, 13 Oct 2018 14:17:11 +0000 (07:17 -0700)]
Merge "Drop unused libcore.io imports." am:
58d5c1e938
am:
66234e3975
Change-Id: I9d48b9ae7ed1e05734110ca0dad8db8a6d743add
Tobias Thierer [Sat, 13 Oct 2018 14:10:47 +0000 (07:10 -0700)]
Merge "Drop unused libcore.io imports."
am:
58d5c1e938
Change-Id: Ifba36af79c08f93ed562908fb2a5db35aea3cb13
Tobias Thierer [Sat, 13 Oct 2018 13:08:13 +0000 (13:08 +0000)]
Merge "Drop unused libcore.io imports."
Tobias Thierer [Sat, 13 Oct 2018 02:13:38 +0000 (19:13 -0700)]
Merge "Remove unused imports of libcore.io.Libcore." am:
2a520365da
am:
abe7a32c67
Change-Id: I57d7d317f5827a54346e287db3f6f2d625e0aebc
Nan Zhang [Sat, 13 Oct 2018 02:00:45 +0000 (19:00 -0700)]
Merge "Enable lint_as_errors for frameworks/base docs" am:
6622d0957d
am:
dd298a4b0f
Change-Id: I0aa3f754d172c4d07c55cc04cac03744b9183e58
Tobias Thierer [Sat, 13 Oct 2018 01:59:21 +0000 (18:59 -0700)]
Merge "Remove unused imports of libcore.io.Libcore."
am:
2a520365da
Change-Id: I79c4679d483e0e8ea2e434237bd61d75f129da0f
Tobias Thierer [Sat, 13 Oct 2018 01:06:58 +0000 (02:06 +0100)]
Drop unused libcore.io imports.
This removes the last import of libcore.io.Libcore from frameworks.
This means that it can be safely hidden from frameworks in a follow-up
CL. Both of the unused imports in this CL were already removed on the
internal master branch (commit
a05a994610a8e55b5cda1059fa816f8796135d9c),
but that commit doesn't cherry-pick cleanly onto AOSP master.
The IoUtils import also appears unused, but it wasn't touched by the
above CL so this CL also leaves it alone.
Bug:
117548625
Test: Treehugger
Change-Id: Icc68c64ef2907372af848d74d9cf96070c89d52b
Chih-Hung Hsieh [Sat, 13 Oct 2018 01:05:24 +0000 (18:05 -0700)]
Merge "Fix implicit fallthrough warnings." am:
012692be3f
am:
3515bf0fc9
Change-Id: Ia07a0a00d1ae547bc7af968e6f8a7caeb51f3e6e
Nan Zhang [Sat, 13 Oct 2018 00:53:06 +0000 (17:53 -0700)]
Merge "Enable lint_as_errors for frameworks/base docs"
am:
6622d0957d
Change-Id: I9beb510137552ee73a4994683ffe86b775f5ad58
Chih-Hung Hsieh [Sat, 13 Oct 2018 00:48:52 +0000 (17:48 -0700)]
Merge "Fix implicit fallthrough warnings."
am:
012692be3f
Change-Id: I37a244c2e850d1247010d92b9e91b9c34df159f1
Treehugger Robot [Sat, 13 Oct 2018 00:47:45 +0000 (00:47 +0000)]
Merge "Remove unused imports of libcore.io.Libcore."
Nan Zhang [Sat, 13 Oct 2018 00:19:45 +0000 (00:19 +0000)]
Merge "Enable lint_as_errors for frameworks/base docs"
Treehugger Robot [Fri, 12 Oct 2018 23:37:23 +0000 (23:37 +0000)]
Merge "Fix implicit fallthrough warnings."
Chih-Hung Hsieh [Fri, 12 Oct 2018 22:05:01 +0000 (15:05 -0700)]
Fix implicit fallthrough warnings.
Test: make checkbuild
Bug:
112564944
Change-Id: Ia33bf816fb6b179ac0a5a6a20bcb50c11b47431d
Nan Zhang [Fri, 12 Oct 2018 01:06:10 +0000 (18:06 -0700)]
Enable lint_as_errors for frameworks/base docs
Add back various error/warning related args while running doclava for
frameworks/base docs.
Test: m -j docs
Bug: b/
116163454
Change-Id: I9cbe3f0bd1b6acfe0b6e2c6567c78bb70f892c77
Chen Xu [Fri, 12 Oct 2018 18:32:19 +0000 (11:32 -0700)]
Merge "refactor data/voice roaming states" am:
6bd29ab2df
am:
652ec06948
Change-Id: I1f82195e5477401f3216db92bbdac388bbe16c7f
Chen Xu [Fri, 12 Oct 2018 18:20:18 +0000 (11:20 -0700)]
Merge "refactor data/voice roaming states"
am:
6bd29ab2df
Change-Id: Iac8184fe2dfdb7ff4c3d93ecb7c0c9dd9a7a46a5
Jack He [Fri, 12 Oct 2018 18:18:09 +0000 (11:18 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am:
2ac8c8a3e2
am:
24591d2641
Change-Id: Idc687ad7ea25b793f5ef12612e161e197d87679d
Nandana Dutt [Fri, 12 Oct 2018 18:07:59 +0000 (11:07 -0700)]
Merge "Add DumpstateOptions java implementation" am:
52502ef1a1
am:
8a9f23c8a1
Change-Id: I392c2c6bdb522efa708b82174debf3a18167c0bc
Jack He [Fri, 12 Oct 2018 18:06:44 +0000 (11:06 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am:
2ac8c8a3e2
Change-Id: I8836294e7206c8e8c024f5b986c25b9cf2dd29d9
Chen Xu [Fri, 12 Oct 2018 18:02:17 +0000 (18:02 +0000)]
Merge "refactor data/voice roaming states"
Nandana Dutt [Fri, 12 Oct 2018 17:58:16 +0000 (10:58 -0700)]
Merge "Add DumpstateOptions java implementation"
am:
52502ef1a1
Change-Id: I18d5d73028a5ebfdf0ac13d141e20cc5356b61e1
Treehugger Robot [Fri, 12 Oct 2018 17:35:14 +0000 (17:35 +0000)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
Nandana Dutt [Fri, 12 Oct 2018 17:31:39 +0000 (17:31 +0000)]
Merge "Add DumpstateOptions java implementation"
Neil Fuller [Fri, 12 Oct 2018 10:22:04 +0000 (03:22 -0700)]
Merge "Remove explicit dependencies on "core" libraries" am:
18f9a2c24d
am:
d252f61f66
Change-Id: Ia66748d28ecb846d190b9dacb004a734c11bc54c
Neil Fuller [Fri, 12 Oct 2018 10:12:22 +0000 (03:12 -0700)]
Merge "Remove explicit dependencies on "core" libraries"
am:
18f9a2c24d
Change-Id: I326380ec0c10f29c09c64f4044a9c79c9ab2648f
Neil Fuller [Fri, 12 Oct 2018 09:49:03 +0000 (09:49 +0000)]
Merge "Remove explicit dependencies on "core" libraries"
Chalard Jean [Fri, 12 Oct 2018 09:48:02 +0000 (02:48 -0700)]
Merge "NetworkMonitor: add log of CaptivePortal result" am:
35d6512a5d
am:
689f888627
Change-Id: Ibe0fbec44aa4dd52646e968d94021ddda0c05d39
Chalard Jean [Fri, 12 Oct 2018 09:32:51 +0000 (02:32 -0700)]
Merge "NetworkMonitor: add log of CaptivePortal result"
am:
35d6512a5d
Change-Id: Iab6aba7e4dab0cddc68b4e7ec5386e46f83a22f6
Chalard Jean [Fri, 12 Oct 2018 08:12:12 +0000 (01:12 -0700)]
Merge "[PT13] Simple cleanup of ProxyTracker." am:
afa7fdabaa
am:
0f81f1e332
Change-Id: I1e643d5be6d7f791c3bbe3ba018e6ad6717e3ddb
Chalard Jean [Fri, 12 Oct 2018 07:57:35 +0000 (07:57 +0000)]
Merge "NetworkMonitor: add log of CaptivePortal result"
Chalard Jean [Fri, 12 Oct 2018 07:50:29 +0000 (00:50 -0700)]
Merge "[PT13] Simple cleanup of ProxyTracker."
am:
afa7fdabaa
Change-Id: I6a30f78e517716ca3ff14a3601374fddc65e4aec
Chalard Jean [Fri, 12 Oct 2018 07:34:43 +0000 (07:34 +0000)]
Merge "[PT13] Simple cleanup of ProxyTracker."
Nan Zhang [Fri, 12 Oct 2018 06:16:13 +0000 (23:16 -0700)]
Merge "Fix incorrect javadoc link" am:
293ab4941b
am:
d96fe8ddd0
Change-Id: I0331d98eb989ee429eb0ef38c448eae551130118
Chalard Jean [Fri, 12 Oct 2018 06:10:48 +0000 (23:10 -0700)]
Merge "[PT12] Factor some code into ProxyTracker." am:
f24b6c77a6
am:
1a70721041
Change-Id: Ib4509788887df4c5c2ef017eb808a38dea0ae00b
Nan Zhang [Fri, 12 Oct 2018 05:59:08 +0000 (22:59 -0700)]
Merge "Fix incorrect javadoc link"
am:
293ab4941b
Change-Id: Id288e51e79c867728e06caa8ee68bf28bd2dcbf5
Jeff Sharkey [Fri, 12 Oct 2018 05:56:08 +0000 (22:56 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c am:
893598cd4b am:
7656e1177f -s ours
am:
58d1ac473e
Change-Id: Ibd2f4fcb800b7a48e7b9313083c88b4441d02f7c
Chalard Jean [Fri, 12 Oct 2018 05:55:28 +0000 (22:55 -0700)]
Merge "[PT12] Factor some code into ProxyTracker."
am:
f24b6c77a6
Change-Id: Ib92107f434576d8296ba74aab0d9abfe56cefa7c
Jeff Sharkey [Fri, 12 Oct 2018 05:48:20 +0000 (22:48 -0700)]
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8 am:
80c65f6ce7 am:
cef9bae62d -s ours
am:
f85bd2b22d
Change-Id: I60947c277004dacba0169413def7f2bf9a0d6bf6
Jeff Sharkey [Fri, 12 Oct 2018 05:20:54 +0000 (22:20 -0700)]
[automerger skipped] Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c am:
893598cd4b
am:
7656e1177f -s ours
Change-Id: I95387eef7f018aceec664807c015eef768fbb4b3
Jeff Sharkey [Fri, 12 Oct 2018 05:19:39 +0000 (22:19 -0700)]
[automerger skipped] [automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8 am:
80c65f6ce7
am:
cef9bae62d -s ours
Change-Id: I5e2cb1a4274d547cfcd18fc010063fa70f75090f
Jeff Sharkey [Fri, 12 Oct 2018 05:14:40 +0000 (22:14 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev am:
ab80221a8c
am:
893598cd4b
Change-Id: Idfabe38c9b34fa6414e3f5a9188e917d29f316f2
Jeff Sharkey [Fri, 12 Oct 2018 05:09:55 +0000 (22:09 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac am:
af72f01db8
am:
80c65f6ce7
Change-Id: I824cd0b4b0bdb66f9762fb9123f639fe3548f164
Jeff Sharkey [Fri, 12 Oct 2018 04:56:21 +0000 (21:56 -0700)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
am:
ab80221a8c
Change-Id: I61ef6b1a189ef345326a5455ff17b47d67f18f8d
Jeff Sharkey [Fri, 12 Oct 2018 04:51:36 +0000 (21:51 -0700)]
[automerger] RESTRICT AUTOMERGE: Recover shady content:// paths. am:
301d17e4dd am:
010585fe3c am:
6ef77aedac am:
ae30765665 skipped:
50e06f25ac
am:
af72f01db8
Change-Id: Ib260367aeaab863c9eeef492d46736dcf1c05591
Jeff Sharkey [Fri, 12 Oct 2018 04:31:20 +0000 (04:31 +0000)]
Merge "RESTRICT AUTOMERGE: Recover shady content:// paths." into oc-dev
Treehugger Robot [Fri, 12 Oct 2018 04:26:49 +0000 (04:26 +0000)]
Merge "Fix incorrect javadoc link"
Chalard Jean [Fri, 12 Oct 2018 04:23:16 +0000 (04:23 +0000)]
Merge "[PT12] Factor some code into ProxyTracker."
Android Build Merger (Role) [Fri, 12 Oct 2018 04:22:50 +0000 (04:22 +0000)]
Merge "Merge "Recover shady content:// paths." into pi-dev am:
7402d7611c" into pi-dev-plus-aosp
Jeff Sharkey [Fri, 12 Oct 2018 04:22:04 +0000 (21:22 -0700)]
Merge "Recover shady content:// paths." into pi-dev
am:
7402d7611c
Change-Id: I499e0086df06d77d1fce3afaa86bb19a136b1ca2
Chalard Jean [Fri, 12 Oct 2018 04:21:45 +0000 (21:21 -0700)]
Merge "Add log for debugging ConnectivityManager" am:
4b48dca2e8
am:
e3c0f28a1e
Change-Id: I2d8604c172b26e474050afd45fba74dc6c2c18bc
Chalard Jean [Fri, 12 Oct 2018 04:11:51 +0000 (21:11 -0700)]
Merge "Add log for debugging ConnectivityManager"
am:
4b48dca2e8
Change-Id: I666e534f42a930a2d0fee55032d7a9e4516349c0
TreeHugger Robot [Fri, 12 Oct 2018 03:59:38 +0000 (03:59 +0000)]
Merge "Recover shady content:// paths." into pi-dev
Chalard Jean [Fri, 12 Oct 2018 03:14:48 +0000 (03:14 +0000)]
Merge "Add log for debugging ConnectivityManager"
Nan Zhang [Fri, 12 Oct 2018 03:02:13 +0000 (03:02 +0000)]
Merge "Fix the incorrect javadoc links" into pi-dev-plus-aosp
Sundong Ahn [Fri, 12 Oct 2018 01:16:00 +0000 (18:16 -0700)]
[automerger skipped] Merge "Add the metalava_enabled property" am:
69251fca46
am:
83a2bc6a3b -s ours
Change-Id: Idacefac9a3991453f635b3bd2af554bf96e4e821
Sundong Ahn [Fri, 12 Oct 2018 01:06:17 +0000 (18:06 -0700)]
Merge "Add the metalava_enabled property"
am:
69251fca46
Change-Id: I5720ce833d0ffd0016dc8a77cb0f56b0d34a9c21
Nan Zhang [Fri, 12 Oct 2018 00:54:36 +0000 (17:54 -0700)]
Fix the incorrect javadoc links
A lot of unresolved link errors showing up after go/ag/
5172152.
Test: m -j docs with -lerror enabled
Bug: b/
116163454
Change-Id: I74d1f75e0f00015410a63e13103c28a9c84b4fe0
Treehugger Robot [Fri, 12 Oct 2018 00:50:32 +0000 (00:50 +0000)]
Merge "Add the metalava_enabled property"
Nan Zhang [Thu, 11 Oct 2018 23:44:28 +0000 (16:44 -0700)]
Fix incorrect javadoc link
Test: m -j docs with -lerror enabled for frameworks/base docs.
Bug: b/
116163454
Change-Id: I02a164b676397dd2d9e8a52ae344c1033b1a4029
Sooraj Sasindran [Thu, 11 Oct 2018 23:28:54 +0000 (16:28 -0700)]
Merge "Introduce AlternativeNetwork APIs" am:
98966bcbb6
am:
10211c1f68
Change-Id: Idb3a45b52567451df01afef5e4131a6426b487dc
OSDN Git Service
