OSDN Git Service
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 05:34:46 +0000 (22:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1867505743cad61f0d2c7722dbfe59efe97d0d3
Auto-generated-cl: translation import
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 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: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: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 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
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:20:18 +0000 (11:20 -0700)]
Merge "refactor data/voice roaming states"
am:
6bd29ab2df
Change-Id: Iac8184fe2dfdb7ff4c3d93ecb7c0c9dd9a7a46a5
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: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:32:51 +0000 (02:32 -0700)]
Merge "NetworkMonitor: add log of CaptivePortal result"
am:
35d6512a5d
Change-Id: Iab6aba7e4dab0cddc68b4e7ec5386e46f83a22f6
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 05:59:08 +0000 (22:59 -0700)]
Merge "Fix incorrect javadoc link"
am:
293ab4941b
Change-Id: Id288e51e79c867728e06caa8ee68bf28bd2dcbf5
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
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."
Chalard Jean [Fri, 12 Oct 2018 04:11:51 +0000 (21:11 -0700)]
Merge "Add log for debugging ConnectivityManager"
am:
4b48dca2e8
Change-Id: I666e534f42a930a2d0fee55032d7a9e4516349c0
Chalard Jean [Fri, 12 Oct 2018 03:14:48 +0000 (03:14 +0000)]
Merge "Add log for debugging ConnectivityManager"
Sundong Ahn [Fri, 12 Oct 2018 01:06:17 +0000 (18:06 -0700)]
Merge "Add the metalava_enabled property"
am:
69251fca46
Change-Id: I5720ce833d0ffd0016dc8a77cb0f56b0d34a9c21
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:15:14 +0000 (16:15 -0700)]
Merge "Introduce AlternativeNetwork APIs"
am:
98966bcbb6
Change-Id: I743fd447fef38c276b105d005c95033fe0393b7e
Sooraj Sasindran [Thu, 11 Oct 2018 22:58:32 +0000 (22:58 +0000)]
Merge "Introduce AlternativeNetwork APIs"
chen xu [Thu, 4 Oct 2018 02:07:09 +0000 (19:07 -0700)]
refactor data/voice roaming states
1. migrate set/get roamingType from ServiceState to
NetworkRegState.set/get roamingType
2. migrate set/get roamingStateFromRegstate from ServiceState
to NetworkRegState.regState
3. new System API for neworkRegistration.isRoaming().
Bug:
116127096
Test: ServiceStateTest, ServiceStateProviderTest
Change-Id: Ib89744089c98713819c8d313240d629ddb77d0bf
Shuzhen Wang [Thu, 11 Oct 2018 21:21:35 +0000 (14:21 -0700)]
Merge "Camera: Trivial doc update"
am:
e9f1e8c123
Change-Id: Id1a9c504a460b9f82496fbfcabb49e1c7f583dba
Jack He [Thu, 11 Oct 2018 00:42:33 +0000 (17:42 -0700)]
Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack
Fixes:
112115770
Test: make
Change-Id: Iaf71aeafa21f44ec9b59c1b766c936ab7dde39f1
Jordan Liu [Thu, 11 Oct 2018 21:04:35 +0000 (14:04 -0700)]
Merge "getTelephonyProperty returns defaultVal"
am:
bb9f855faa
Change-Id: Icb376469926ed70658d8eceb54c9da4ab57a2d55
Shuzhen Wang [Thu, 11 Oct 2018 21:02:32 +0000 (21:02 +0000)]
Merge "Camera: Trivial doc update"
Tyler Gunn [Thu, 11 Oct 2018 20:40:57 +0000 (13:40 -0700)]
Merge "Update PROPERTY_HIGH_DEF_AUDIO API docs."
am:
5674805cda
Change-Id: I4ebe0542fc233f992e123f1715621855e253bf14
Janis Danisevskis [Thu, 11 Oct 2018 20:36:49 +0000 (13:36 -0700)]
Merge changes I7070326d,I8346e53c
am:
546073a5b6
Change-Id: I4ca0a1ebf9240d81dbbf966fd2ceae3c2bd39a2c
Treehugger Robot [Thu, 11 Oct 2018 20:30:17 +0000 (20:30 +0000)]
Merge "getTelephonyProperty returns defaultVal"
Treehugger Robot [Thu, 11 Oct 2018 20:15:46 +0000 (20:15 +0000)]
Merge "Update PROPERTY_HIGH_DEF_AUDIO API docs."
Treehugger Robot [Thu, 11 Oct 2018 19:05:27 +0000 (19:05 +0000)]
Merge changes I7070326d,I8346e53c
* changes:
Add OWNERS file to AndroidKeystoreSPI implementation
KeyguardStateMonitor looses connection with keystore if keystore dies
Chen Xu [Thu, 11 Oct 2018 18:36:27 +0000 (11:36 -0700)]
Merge "Create URI for individual user settings in SIMINFO"
am:
cb90628990
Change-Id: I335656c76eb878f5558853026f9403e258728056
Chen Xu [Thu, 11 Oct 2018 18:19:12 +0000 (18:19 +0000)]
Merge "Create URI for individual user settings in SIMINFO"
Tyler Gunn [Thu, 11 Oct 2018 17:42:10 +0000 (10:42 -0700)]
Update PROPERTY_HIGH_DEF_AUDIO API docs.
Make it more clear that the intention of the property is to convey whether
a call is high definition on the UI or not, and NOT to report the actual
audio codec in use.
Test: Build
Bug:
78550833
Change-Id: Id002cd1c9cc1d5aea6f8d9ab4e3d99956b7c42b2
Neil Fuller [Thu, 11 Oct 2018 17:17:18 +0000 (10:17 -0700)]
Merge "Remove ResponseCache from apache-http"
am:
73e8858e4b
Change-Id: I3893aebedf3b0da1dc3a0a42184a1c5e486e5742
Sooraj Sasindran [Mon, 6 Aug 2018 22:24:45 +0000 (15:24 -0700)]
Introduce AlternativeNetwork APIs
Introduce AlternativeNetwork APIs
Bug:
113106744
Test: Verified using test app to make api calls
Change-Id: I134d1aef40f014378fd1364e0bfec6926fe2093e
Merged-In: I7f470cd6028a12cc66a660d58720f803271d38eb
Treehugger Robot [Thu, 11 Oct 2018 16:37:03 +0000 (16:37 +0000)]
Merge "Remove ResponseCache from apache-http"
Janis Danisevskis [Thu, 11 Oct 2018 16:19:41 +0000 (09:19 -0700)]
Add OWNERS file to AndroidKeystoreSPI implementation
Change-Id: I7070326d680c6bff00839d847f8fadbbe2b16fa7
Shuzhen Wang [Thu, 11 Oct 2018 16:17:08 +0000 (09:17 -0700)]
Camera: Trivial doc update
Change-Id: I63198c6d2cb348380e718974dd356d48137ae376
David Brazdil [Thu, 11 Oct 2018 16:14:20 +0000 (09:14 -0700)]
Merge changes Icd51c4c7,I836ecb94
am:
3590eb09ef
Change-Id: I70530ca7b04026b4ec436cf235a2b35c63689189
Nandana Dutt [Wed, 3 Oct 2018 09:01:25 +0000 (10:01 +0100)]
Add DumpstateOptions java implementation
DumpstateOptions will be used to pass options to Dumpstate service
for specifying arguments for taking bugreports.
Test: m
Test: adb bugreport
Change-Id: I4dc9511f0be2f86239ea9094a3c527b6ce0d1d41
Janis Danisevskis [Wed, 10 Oct 2018 16:32:39 +0000 (09:32 -0700)]
KeyguardStateMonitor looses connection with keystore if keystore dies
When keystore dies it no longer gets information about the lock screen
visibility state. This state is vital to enforcing the "unlocked
device required" authorization of keymaster keys.
With this patch KeyguardStateMonitor tries to reestablish the connection
to keystore if communication fails.
Test: run atest android.keystore.cts.CipherTest#testKeyguardLockAndUnlock
after killing keystore
Bug:
117552147
Change-Id: I8346e53c342bdba0f5960b1feba7c26db5cef33e
Neil Fuller [Thu, 4 Oct 2018 09:45:21 +0000 (10:45 +0100)]
Remove explicit dependencies on "core" libraries
The dependencies are unnecessary since bouncycastle, okhttp
and conscrypt are included in the "standard libraries".
Test: build
Bug:
113148576
Change-Id: Ic8d15d911decbdd6391db8c1231b845353586a54
Android Build Merger (Role) [Thu, 11 Oct 2018 15:45:44 +0000 (15:45 +0000)]
Merge changes into stage-aosp-master
Android Build Merger (Role) [Thu, 11 Oct 2018 15:45:44 +0000 (15:45 +0000)]
Merge changes into stage-aosp-master
Andreas Gampe [Thu, 11 Oct 2018 15:44:17 +0000 (08:44 -0700)]
Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check"
am:
9135811848
Change-Id: I2832abb30bc7e96e92ac900cc84715dcab9cabc3
David Brazdil [Thu, 11 Oct 2018 15:35:58 +0000 (15:35 +0000)]
Merge changes Icd51c4c7,I836ecb94
* changes:
Add entries to hidden api greylist
Add method to hidden api greylist
Treehugger Robot [Thu, 11 Oct 2018 15:10:34 +0000 (15:10 +0000)]
Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check"
Tadashi G. Takaoka [Thu, 11 Oct 2018 13:54:51 +0000 (06:54 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests""
am:
e908a1d318 -s ours
Change-Id: I765f4286e09535ecc577f6629cd218169639036e
Fabrício Ferracioli [Thu, 11 Oct 2018 13:40:45 +0000 (06:40 -0700)]
Merge "Whitelist free short code batch for 2018 Q3"
am:
be338ad5a0
Change-Id: I550067fc39ab9554d761981af108b34272c4ed22
Chalard Jean [Thu, 11 Oct 2018 13:36:29 +0000 (06:36 -0700)]
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
am:
a3b3b6468e
Change-Id: I91e1a230864f0d5d826c01f91918a35461e2a433
Treehugger Robot [Thu, 11 Oct 2018 13:24:02 +0000 (13:24 +0000)]
Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests""
Fabrício Ferracioli [Thu, 11 Oct 2018 13:06:16 +0000 (13:06 +0000)]
Merge "Whitelist free short code batch for 2018 Q3"
Treehugger Robot [Thu, 11 Oct 2018 12:50:17 +0000 (12:50 +0000)]
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker"
David Brazdil [Thu, 11 Oct 2018 11:24:48 +0000 (12:24 +0100)]
Add entries to hidden api greylist
Bug:
115387204
Test: m appcompat
Change-Id: Icd51c4c7d446ea72211804fbb050f4fee742db17
David Brazdil [Thu, 11 Oct 2018 11:19:53 +0000 (12:19 +0100)]
Add method to hidden api greylist
Bug:
114488777
Test: m appcompat
Change-Id: I836ecb947390f7fc6986f6848299375c7599fc97
Neil Fuller [Thu, 11 Oct 2018 08:24:27 +0000 (01:24 -0700)]
Merge "Remove unused import"
am:
ab81538d6b
Change-Id: Ia8bf5f99ccc30540041e004224ce7cd456ec0faa
Neil Fuller [Thu, 11 Oct 2018 08:06:48 +0000 (08:06 +0000)]
Merge "Remove unused import"
Tadashi G. Takaoka [Thu, 11 Oct 2018 07:51:35 +0000 (07:51 +0000)]
Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"
This reverts commit
dee5a4dc2a5a6829e5509fc0e94903e30dcc238f.
Reason for revert: CLs on upstream branch are on hold.
Change-Id: I253294d080efdfd1dbf377812f12880e03dff1f6
Luke Huang [Thu, 11 Oct 2018 06:10:10 +0000 (23:10 -0700)]
Merge "Refactor tetherGetStats by using stable aidl structure"
am:
335253df0f
Change-Id: Ibaefeee3e115cc04163f1b07cdba148f9e9ab3b5
Luke Huang [Thu, 11 Oct 2018 05:58:22 +0000 (05:58 +0000)]
Merge "Refactor tetherGetStats by using stable aidl structure"
Jack He [Thu, 11 Oct 2018 03:59:31 +0000 (20:59 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
am:
cf1176073d
Change-Id: I1715c848fac8adfd41c7371a7103ea31bf4488ac
Treehugger Robot [Thu, 11 Oct 2018 03:32:10 +0000 (03:32 +0000)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED"
Lorenzo Colitti [Thu, 11 Oct 2018 03:14:03 +0000 (20:14 -0700)]
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
am:
772b75c26d
Change-Id: Ib418ca0a9f8d9be9c4bdc419c9d2ed05aa47a49d
Treehugger Robot [Thu, 11 Oct 2018 02:44:21 +0000 (02:44 +0000)]
Merge "Make setAirplaneMode @SystemApi for SetupWizard."
Jack He [Thu, 11 Oct 2018 00:42:48 +0000 (17:42 -0700)]
Remove BluetoothDevice.ACTION_DISAPPEARED
This intent was never sent by the Bluetooth stack
Bug:
112115770
Test: make
Change-Id: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
Merged-In: I6c2b87529af7e6a7123cde8141fbdb9d1822ec9f
(cherry picked from commit
dd1c592fcd11e2bee25db0077da0ef3f59071d5d)
Tor Norbye [Wed, 10 Oct 2018 23:39:36 +0000 (16:39 -0700)]
Merge "Fix incorrect javadoc links"
am:
0d954557a1
Change-Id: Id358aab44d8e77561a9b5cb27c363d2325a79086