OSDN Git Service
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
Treehugger Robot [Fri, 12 Oct 2018 00:50:32 +0000 (00:50 +0000)]
Merge "Add the metalava_enabled property"
Sooraj Sasindran [Thu, 11 Oct 2018 23:28:54 +0000 (16:28 -0700)]
Merge "Introduce AlternativeNetwork APIs" am:
98966bcbb6
am:
10211c1f68
Change-Id: Idb3a45b52567451df01afef5e4131a6426b487dc
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"
Shuzhen Wang [Thu, 11 Oct 2018 21:34:05 +0000 (14:34 -0700)]
Merge "Camera: Trivial doc update" am:
e9f1e8c123
am:
9481340777
Change-Id: I5d9c7fc848eb154e27012f1101340da2195bc423
Shuzhen Wang [Thu, 11 Oct 2018 21:21:35 +0000 (14:21 -0700)]
Merge "Camera: Trivial doc update"
am:
e9f1e8c123
Change-Id: Id1a9c504a460b9f82496fbfcabb49e1c7f583dba
Jordan Liu [Thu, 11 Oct 2018 21:12:55 +0000 (14:12 -0700)]
Merge "getTelephonyProperty returns defaultVal" am:
bb9f855faa
am:
ca854cc2b9
Change-Id: I6774ef18f185f35344bef3bf42ab5addf23ea03a
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:57:35 +0000 (13:57 -0700)]
Merge "Update PROPERTY_HIGH_DEF_AUDIO API docs." am:
5674805cda
am:
f17f1d7cdc
Change-Id: I884edd29bd9bd42c44c537d2e22879815086e4c6
Janis Danisevskis [Thu, 11 Oct 2018 20:51:49 +0000 (13:51 -0700)]
Merge changes I7070326d,I8346e53c am:
546073a5b6
am:
11e9a86034
Change-Id: I51ea833a23e0f511291c261c8741792c3dbc911a
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:46:29 +0000 (11:46 -0700)]
Merge "Create URI for individual user settings in SIMINFO" am:
cb90628990
am:
2c0e41694e
Change-Id: I2108c6a70ed49b74754de445e9b3f89a5ee083e0
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:37:41 +0000 (10:37 -0700)]
Merge "Remove ResponseCache from apache-http" am:
73e8858e4b
am:
47fa25edbc
Change-Id: If8411c4bb6542763474ee427bd4fcf38400d5f00
Neil Fuller [Thu, 11 Oct 2018 17:32:23 +0000 (10:32 -0700)]
Merge "Remove ResponseCache from apache-http"
am:
73e8858e4b
Change-Id: Ib8b843a7e480419ee0b802518ca22c182c3fedef
Neil Fuller [Thu, 11 Oct 2018 17:28:10 +0000 (10:28 -0700)]
Remove ResponseCache from apache-http
am:
0a7b572079
Change-Id: Ie6dc414ce7419474a24062fdf7ae57182b892048
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"
David Brazdil [Thu, 11 Oct 2018 16:24:53 +0000 (09:24 -0700)]
Merge changes Icd51c4c7,I836ecb94 am:
3590eb09ef
am:
b03f3c8ba2
Change-Id: I8cbd96fc305e8356addbe4211275296c3ce0be43
Janis Danisevskis [Thu, 11 Oct 2018 16:19:41 +0000 (09:19 -0700)]
Add OWNERS file to AndroidKeystoreSPI implementation
Change-Id: I7070326d680c6bff00839d847f8fadbbe2b16fa7
Andreas Gampe [Thu, 11 Oct 2018 16:18:51 +0000 (09:18 -0700)]
Merge changes into stage-aosp-master
am:
2d7b242700
Change-Id: Iee2f5645cbe6122eececc1f0517175daa5b414ed
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
Andreas Gampe [Thu, 11 Oct 2018 16:13:43 +0000 (09:13 -0700)]
Merge changes into stage-aosp-master
am:
680f735ef1
Change-Id: Ic989692175b2763d58d3cbc169919ee24d2ba2d0
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
Andreas Gampe [Thu, 11 Oct 2018 15:59:08 +0000 (08:59 -0700)]
Merge "Frameworks: Add VMRuntime.hasBootImageSpaces check" am:
9135811848
am:
b9da5284fc
Change-Id: Ib02426fb94ab9fc4b448ebb5f4d928ec2cb7afbf
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 14:01:56 +0000 (07:01 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE: Move AM/WM unit tests out of FrameworksServicesTests to WmTests"" am:
e908a1d318 -s ours
am:
f7a03e7b3a -s ours
Change-Id: If9a4fa6ede676b0426992023da1259753fe3d064
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:54:06 +0000 (06:54 -0700)]
Merge "Whitelist free short code batch for 2018 Q3" am:
be338ad5a0
am:
262153bdda
Change-Id: I97b4f438d2b452a2321eb2a1f5c8f69f6301b6f6
Chalard Jean [Thu, 11 Oct 2018 13:48:47 +0000 (06:48 -0700)]
Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am:
a3b3b6468e
am:
d75467d84a
Change-Id: Idbb16f8ae3b35f22cbef254c5f20aaf989acaab9
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:34:54 +0000 (01:34 -0700)]
Merge "Remove unused import" am:
ab81538d6b
am:
5fb271a34b
Change-Id: I631465f20cc25ede326d3ddd0433414dff4db402
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:23:22 +0000 (23:23 -0700)]
Merge "Refactor tetherGetStats by using stable aidl structure" am:
335253df0f
am:
f81dce0f79
Change-Id: I69fd29655d672e42a2af991de613c54105f751d5
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"
Android Build Merger (Role) [Thu, 11 Oct 2018 04:24:19 +0000 (04:24 +0000)]
Merge "Merge "Do not start VrManagerService if VR is not supported" into pi-dev am:
2667c1dfa2" into pi-dev-plus-aosp
Rick Yiu [Thu, 11 Oct 2018 04:23:50 +0000 (21:23 -0700)]
Merge "Do not start VrManagerService if VR is not supported" into pi-dev
am:
2667c1dfa2
Change-Id: I76eb570e1c08ee57d931221169b503033e466d49
Jack He [Thu, 11 Oct 2018 04:21:21 +0000 (21:21 -0700)]
Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" am:
cf1176073d
am:
7886cfcf56
Change-Id: I6a742cb541d072338707b5b611f9afc7f541275f
Rick Yiu [Thu, 11 Oct 2018 04:17:37 +0000 (21:17 -0700)]
Merge changes If834d0f0,I05ec75c7 into pi-dev
am:
6d61113df4
Change-Id: Ie4c3729fc1258f0f452fb57b6b345e873bfb440d
Rick Yiu [Thu, 11 Oct 2018 04:10:31 +0000 (21:10 -0700)]
Merge "Add null check for vrManager" into pi-dev
am:
dd7047b4e8
Change-Id: I39fb005c2013085e7104abbc113585b6a465e640
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:26:35 +0000 (20:26 -0700)]
Merge "Make setAirplaneMode @SystemApi for SetupWizard." am:
772b75c26d
am:
aab9359c05
Change-Id: I8049e2484526104eba7fad92d2819eb94319fa84
TreeHugger Robot [Thu, 11 Oct 2018 03:18:04 +0000 (03:18 +0000)]
Merge "Do not start VrManagerService if VR is not supported" into pi-dev
TreeHugger Robot [Thu, 11 Oct 2018 03:17:18 +0000 (03:17 +0000)]
Merge changes If834d0f0,I05ec75c7 into pi-dev
* changes:
Add null check for vrManager
Add null check for vrManager
TreeHugger Robot [Thu, 11 Oct 2018 03:17:12 +0000 (03:17 +0000)]
Merge "Add null check for vrManager" into pi-dev
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 [Thu, 11 Oct 2018 00:20:42 +0000 (17:20 -0700)]
Merge "Fix incorrect javadoc links" am:
0d954557a1
am:
cd1c75ae4c
Change-Id: I6d8c44be9d156ac2b6a20d3d13972371ee4d741e
Colin Cross [Wed, 10 Oct 2018 23:54:35 +0000 (16:54 -0700)]
Merge changes from topic "aapt2-manifest-elements" am:
e75f2f504e
am:
bfff7e2fe8
Change-Id: I4b5cf2fc84459dad8a28459c30f45b283a71605e
Colin Cross [Wed, 10 Oct 2018 23:49:04 +0000 (16:49 -0700)]
Merge changes from topic "aapt2-manifest-elements"
am:
e75f2f504e
Change-Id: Id4ba91518c3160f936325454814d35bde7f60496
Colin Cross [Wed, 10 Oct 2018 23:45:01 +0000 (16:45 -0700)]
Remove workarounds for b/
79755007
am:
f5c86dc1c1
Change-Id: I5bb981fdf807749c88492dfb2c24ea8b936992cf
Ryan Mitchell [Wed, 10 Oct 2018 23:42:07 +0000 (16:42 -0700)]
AAPT2: Add the rest of supported manifest elements am:
00d5548355
am:
6ffa32f13d
Change-Id: Ie49279be2faebd550cede4d157e85d9b87502333
Tor Norbye [Wed, 10 Oct 2018 23:39:36 +0000 (16:39 -0700)]
Merge "Fix incorrect javadoc links"
am:
0d954557a1
Change-Id: Id358aab44d8e77561a9b5cb27c363d2325a79086
Ryan Mitchell [Wed, 10 Oct 2018 23:37:50 +0000 (16:37 -0700)]
AAPT2: Add the rest of supported manifest elements
am:
00d5548355
Change-Id: I6814dc6e5cc5e3ffdad086c69a5f7b86f9a93030
Ryan Mitchell [Wed, 10 Oct 2018 23:35:04 +0000 (16:35 -0700)]
AAPT2: Add supported manifest elements am:
48d009ad32
am:
840beebdb4
Change-Id: I0867afb4176ccba319fbc3f47b09026696d46e0f
Ryan Mitchell [Wed, 10 Oct 2018 23:30:38 +0000 (16:30 -0700)]
AAPT2: Add supported manifest elements
am:
48d009ad32
Change-Id: I4b9a298615309ceca25f3399b5244d89b12db163
Treehugger Robot [Wed, 10 Oct 2018 23:23:53 +0000 (23:23 +0000)]
Merge "Fix incorrect javadoc links"
Colin Cross [Wed, 10 Oct 2018 23:13:26 +0000 (16:13 -0700)]
Merge changes from topic "aapt2-manifest-elements"
am:
e75f2f504e
Change-Id: I2cf054f942109e539c2439887078a6e182603456
Neil Fuller [Wed, 10 Oct 2018 23:07:04 +0000 (16:07 -0700)]
Merge "Avoid hidden DataFormat.is24Hour field access" am:
4d9823f3eb
am:
64106e4399
Change-Id: Ibf5b2fb27842fb2333fb8271f5cd6fe69c6963d1
Ryan Mitchell [Wed, 10 Oct 2018 23:06:48 +0000 (16:06 -0700)]
AAPT2: Add the rest of supported manifest elements
am:
00d5548355
Change-Id: I9c8002d2891d762e579d0d987bb52856fb20df17
Ryan Mitchell [Wed, 10 Oct 2018 23:00:02 +0000 (16:00 -0700)]
AAPT2: Add supported manifest elements
am:
48d009ad32
Change-Id: Ib620e6c3a5ee6b4a33f4d64a9afa44302de67d7a
Yangster [Wed, 10 Oct 2018 22:53:35 +0000 (15:53 -0700)]
Merge "Phone service state change atom." am:
419fc89b52
am:
16e3399902
Change-Id: Ifbff53d3b113c527975b5509289600f734dcca7b
Neil Fuller [Wed, 10 Oct 2018 22:51:10 +0000 (15:51 -0700)]
Merge "Avoid hidden DataFormat.is24Hour field access"
am:
4d9823f3eb
Change-Id: If06ff869b5363867287cb37c86b1bf558bfa55db
Simran Basi [Wed, 10 Oct 2018 22:43:02 +0000 (15:43 -0700)]
Merge "Merge "dex/TEST_MAPPING: referenced non-test modules" am:
81f32238ea" into stage-aosp-master
am:
55053f86d7
Change-Id: Ib42f406c0f083ce57dbcfb29f839959a8cf7f168
Treehugger Robot [Wed, 10 Oct 2018 22:29:57 +0000 (22:29 +0000)]
Merge changes from topic "aapt2-manifest-elements"
* changes:
Remove workarounds for b/
79755007
AAPT2: Add the rest of supported manifest elements
AAPT2: Add supported manifest elements
Simran Basi [Wed, 10 Oct 2018 22:29:53 +0000 (15:29 -0700)]
Merge "dex/TEST_MAPPING: referenced non-test modules" am:
81f32238ea
am:
b59fa8a72c
Change-Id: I43692ed3fa2231f21df85ce3a5533666ef7f716d
Yangster [Wed, 10 Oct 2018 22:24:17 +0000 (15:24 -0700)]
Merge "Phone service state change atom."
am:
419fc89b52
Change-Id: Iae02f9eee2616affb810c54f1af62693d29b5822
Android Build Merger (Role) [Wed, 10 Oct 2018 22:19:43 +0000 (22:19 +0000)]
Merge "Merge "dex/TEST_MAPPING: referenced non-test modules" am:
81f32238ea" into stage-aosp-master
Simran Basi [Wed, 10 Oct 2018 22:18:57 +0000 (15:18 -0700)]
Merge "dex/TEST_MAPPING: referenced non-test modules"
am:
81f32238ea
Change-Id: Ief1b1646f7ed2d22e70aa2346eb7ac5c17880640
Neil Fuller [Wed, 10 Oct 2018 22:12:56 +0000 (22:12 +0000)]
Merge "Avoid hidden DataFormat.is24Hour field access"
Simran Basi [Wed, 10 Oct 2018 22:10:27 +0000 (15:10 -0700)]
Merge "dex/TEST_MAPPING: referenced non-test modules"
am:
81f32238ea
Change-Id: Ib5d5a4dc6002d530d8fedbac8e8de9b06cb73ec9
Scott Kennedy [Wed, 10 Oct 2018 22:04:12 +0000 (15:04 -0700)]
Merge "Mark getInstallerPackageName @Nullable" am:
c41a5d6bc0
am:
cecccf6258
Change-Id: Ib27badf42d90932da0b7f2f0922b8903936feafd
Scott Kennedy [Wed, 10 Oct 2018 21:57:22 +0000 (14:57 -0700)]
Merge "Mark getInstallerPackageName @Nullable"
am:
c41a5d6bc0
Change-Id: I9500bd37c872fac143074d9a79402d07b0c0419d
Neil Fuller [Wed, 10 Oct 2018 21:56:56 +0000 (14:56 -0700)]
Merge "Remove usage of StringFactory" am:
8a79748b0c
am:
49b054800d
Change-Id: I51e4479f4d7fa868392ce807c38f3a2463be213d
OSDN Git Service
