OSDN Git Service
Misha Wagner [Tue, 2 Apr 2019 13:19:49 +0000 (13:19 +0000)]
Merge "Add diffing to KernelCpuThreadReader"
Alan Stokes [Tue, 2 Apr 2019 12:57:50 +0000 (12:57 +0000)]
Merge "Allow background activity starts to be controlled by DeviceConfig."
TreeHugger Robot [Tue, 2 Apr 2019 12:55:44 +0000 (12:55 +0000)]
Merge "Fix flaky test on daylight savings"
TreeHugger Robot [Tue, 2 Apr 2019 12:52:54 +0000 (12:52 +0000)]
Merge "Fix AndroidTest.xml"
Junyu Lai [Tue, 2 Apr 2019 11:24:18 +0000 (04:24 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive" am:
7934214f4c am:
deae9510db
am:
ef940cfef0
Change-Id: I5f1709f35a5faec7d9a110f3fa24e89ed1b05fbe
Junyu Lai [Tue, 2 Apr 2019 11:15:07 +0000 (04:15 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive" am:
7934214f4c
am:
deae9510db
Change-Id: I25daef8b1bbbbe93e636c320a032a486751ebcc9
Junyu Lai [Tue, 2 Apr 2019 11:05:49 +0000 (04:05 -0700)]
Merge "Ignore the asynchronous result while stopping keepalive"
am:
7934214f4c
Change-Id: Idc6d76ca412f7bbae3b32e81756c419d84dc2c80
Junyu Lai [Tue, 2 Apr 2019 10:48:23 +0000 (10:48 +0000)]
Merge "Ignore the asynchronous result while stopping keepalive"
Richard Uhler [Tue, 2 Apr 2019 09:07:17 +0000 (09:07 +0000)]
Merge "Block getAvailableRollbacks on the handler thread."
Paul Hu [Tue, 2 Apr 2019 08:29:08 +0000 (01:29 -0700)]
Merge "Address leftover comments on 923337 and 930217." am:
1e97aab6f4 am:
55a22b5d17
am:
1d7b92b9d5
Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65
Paul Hu [Tue, 2 Apr 2019 08:14:24 +0000 (01:14 -0700)]
Merge "Address leftover comments on 923337 and 930217." am:
1e97aab6f4
am:
55a22b5d17
Change-Id: Ibbc8dd7bb869f76515c9f57793db02953dd07804
Paul Hu [Tue, 2 Apr 2019 07:58:18 +0000 (00:58 -0700)]
Merge "Address leftover comments on 923337 and 930217."
am:
1e97aab6f4
Change-Id: I733160ae51b8f0e80f78ab375cdb0a547b74f68d
Zimuzo Ezeozue [Tue, 2 Apr 2019 07:47:27 +0000 (07:47 +0000)]
Merge "Update activity recognition permission naming"
Paul Hu [Tue, 2 Apr 2019 07:39:04 +0000 (07:39 +0000)]
Merge "Address leftover comments on 923337 and 930217."
TreeHugger Robot [Tue, 2 Apr 2019 06:38:55 +0000 (06:38 +0000)]
Merge "Avoid holding WM lock on input path"
Frank Li [Tue, 2 Apr 2019 06:13:00 +0000 (06:13 +0000)]
Merge "update dns message atom"
Mohammad Samiul Islam [Tue, 2 Apr 2019 05:33:44 +0000 (05:33 +0000)]
Merge "Improve PackageInfo parsing for apex files"
TreeHugger Robot [Tue, 2 Apr 2019 05:01:28 +0000 (05:01 +0000)]
Merge "fail multi install when child fails"
TreeHugger Robot [Tue, 2 Apr 2019 04:14:44 +0000 (04:14 +0000)]
Merge "Migrate away from WebView fallback logic."
Joshua Mccloskey [Tue, 2 Apr 2019 03:56:00 +0000 (03:56 +0000)]
Merge "Adding latency biometric for enroll."
TreeHugger Robot [Tue, 2 Apr 2019 03:55:48 +0000 (03:55 +0000)]
Merge "Remove allocation in onLayout"
Steven Moreland [Tue, 2 Apr 2019 03:14:55 +0000 (20:14 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders.""" am:
4b5ca28dfe am:
4e709ea3fd
am:
96724b57ae
Change-Id: I3de2f4b4fb092d0db5001209d68ea217e150b8da
Jeff Sharkey [Tue, 2 Apr 2019 02:59:38 +0000 (02:59 +0000)]
Merge "Remove greylist of apps that gain legacy access."
Steven Moreland [Tue, 2 Apr 2019 02:50:13 +0000 (19:50 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders.""" am:
4b5ca28dfe
am:
4e709ea3fd
Change-Id: Ia5b6280f17a67f0fa791f36544a77e2af99e7e0e
Android Build Merger (Role) [Tue, 2 Apr 2019 02:48:30 +0000 (02:48 +0000)]
Merge "[automerger skipped] Merge "API Feedback for CBRS" am:
9c706654a2 am:
f9edc9fffd am:
4e578310f8 -s ours am skip reason: change_id I2476834a5048d0e3c2c3413d7168a7a3ad2d7042 with SHA1
32240b572b is in history"
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:46:38 +0000 (19:46 -0700)]
[automerger skipped] Merge "API Feedback for CBRS" am:
9c706654a2 am:
f9edc9fffd
am:
4e578310f8 -s ours
am skip reason: change_id I2476834a5048d0e3c2c3413d7168a7a3ad2d7042 with SHA1
32240b572b is in history
Change-Id: I751e7c20c5e7f6eb4b82ea8e0aad6cbcca176ae6
TreeHugger Robot [Tue, 2 Apr 2019 02:41:29 +0000 (02:41 +0000)]
Merge "WM: Add a crop to touchable region if needed"
Steven Moreland [Tue, 2 Apr 2019 02:38:43 +0000 (19:38 -0700)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
am:
4b5ca28dfe
Change-Id: I63fa6d4a8671db24bf9fce898414c27068547ed2
TreeHugger Robot [Tue, 2 Apr 2019 02:36:21 +0000 (02:36 +0000)]
Merge "Batch the commit-to-disk of new persisted jobs"
Paul Hu [Tue, 2 Apr 2019 02:32:54 +0000 (19:32 -0700)]
Merge "[IPMS] Implement regular maintenance" am:
7f10bb1c11 am:
c308297bc2
am:
7da31a0cf5
Change-Id: I5be38b1eb3d05d5e7c8fa93094816bb3dab7b5d4
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:26:11 +0000 (19:26 -0700)]
Merge "API Feedback for CBRS" am:
9c706654a2
am:
f9edc9fffd
Change-Id: I7c449a129ab8bd759b40e0aa0a429dd7847ef755
Paul Hu [Tue, 2 Apr 2019 02:24:38 +0000 (19:24 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am:
66a133858b am:
9872066d02
am:
c13f50f5af
Change-Id: I9e74dc9bf30a53ce78395e502a52891ba488f4b1
Steven Moreland [Tue, 2 Apr 2019 02:19:44 +0000 (02:19 +0000)]
Merge "Revert "Revert "Preload non-bootclasspath Java lib ClassLoaders."""
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 02:10:02 +0000 (19:10 -0700)]
Merge "API Feedback for CBRS"
am:
9c706654a2
Change-Id: I6a6d0a81100093696fc6e4b66b32e34dbed49913
Paul Hu [Tue, 2 Apr 2019 02:09:46 +0000 (19:09 -0700)]
Merge "[IPMS] Implement regular maintenance" am:
7f10bb1c11
am:
c308297bc2
Change-Id: Ia9bb46e1ffaf3c3d0a268de1dc0a2fad03b4e240
Remi NGUYEN VAN [Tue, 2 Apr 2019 02:04:18 +0000 (19:04 -0700)]
[automerger skipped] Merge "Rename NetworkStackPermissionStub" am:
073e73a0c1 am:
63d998d859
am:
aae8aa3dde -s ours
am skip reason: change_id I7bdc058dddfa483823074055ad5c9d7d2efd37b9 with SHA1
63b386cd0b is in history
Change-Id: If16e04ff1d3aefe408895252c7c2b8233238e65d
Paul Hu [Tue, 2 Apr 2019 01:59:35 +0000 (18:59 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail." am:
66a133858b
am:
9872066d02
Change-Id: I257b51a4f0be974eacf8a6c0f12b5d5aacdc7a5f
Paul Hu [Tue, 2 Apr 2019 01:58:18 +0000 (18:58 -0700)]
Merge "[IPMS] Implement regular maintenance"
am:
7f10bb1c11
Change-Id: I82e4bc47ed3dc2d1b6907c7229df296ba2b4d88e
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:54:02 +0000 (18:54 -0700)]
Merge "Rename NetworkStackPermissionStub" am:
073e73a0c1
am:
63d998d859
Change-Id: Iffecb9d56fe90d9c62e963c2c38094f0c2b21f39
Paul Hu [Tue, 2 Apr 2019 01:47:42 +0000 (18:47 -0700)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail."
am:
66a133858b
Change-Id: I0926ee39c306fefdd158e1c4c7e4c1ba4b7c5f7d
Xiangyu/Malcolm Chen [Tue, 2 Apr 2019 01:46:19 +0000 (01:46 +0000)]
Merge "API Feedback for CBRS"
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:43:14 +0000 (18:43 -0700)]
Merge "Rename NetworkStackPermissionStub"
am:
073e73a0c1
Change-Id: I616fb13add96c3c4708510138a4e920336695239
Paul Hu [Tue, 2 Apr 2019 01:39:38 +0000 (01:39 +0000)]
Merge "[IPMS] Implement regular maintenance"
Paul Hu [Tue, 2 Apr 2019 01:33:02 +0000 (01:33 +0000)]
Merge "Fix IpPrefixTest#testContainsInetAddress fail."
Remi NGUYEN VAN [Tue, 2 Apr 2019 01:31:51 +0000 (01:31 +0000)]
Merge "Rename NetworkStackPermissionStub"
TreeHugger Robot [Tue, 2 Apr 2019 01:30:01 +0000 (01:30 +0000)]
Merge "Fix padding of title on entity header does not wrap properly"
TreeHugger Robot [Tue, 2 Apr 2019 01:25:19 +0000 (01:25 +0000)]
Merge "Clarifying Battery Saver GPS Disable"
TreeHugger Robot [Tue, 2 Apr 2019 01:17:46 +0000 (01:17 +0000)]
Merge "Add INSTALL_STAGED_CANCEL_* enums"
Chalard Jean [Tue, 2 Apr 2019 01:13:24 +0000 (18:13 -0700)]
Merge "Cleanup SystemReady in the network stack" am:
e0ef7ce4f7 am:
4b130e8567
am:
aafb4b0576
Change-Id: I0e57236ede9dd176cd30ea034d05205776662c91
Hall Liu [Tue, 2 Apr 2019 00:57:09 +0000 (17:57 -0700)]
[automerger skipped] Merge "Add a new carrier config to show the WFC location privacy policy UI" am:
4c508d1b03 am:
d94791b712
am:
516b07ee2c -s ours
am skip reason: change_id I58df76ae97b54009b55a7a78fcaec95cd9b27ca6 with SHA1
7f3a9d08c6 is in history
Change-Id: If02ed9c640ad95115d27579f5357ff540caf4341
Chiachang Wang [Tue, 2 Apr 2019 00:51:51 +0000 (00:51 +0000)]
Merge "Link to android experimental flags API"
Jeff Sharkey [Tue, 2 Apr 2019 00:42:51 +0000 (18:42 -0600)]
Remove greylist of apps that gain legacy access.
Per design pivot, access to legacy behavior will be determined by
the new "allowExternalStorageSandbox" manifest flag.
Bug:
124818022,
129487770
Test: atest --test-mapping packages/providers/MediaProvider
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Change-Id: I169e5eb3612c23aad47204cde9ff263f9df6f8c1
TreeHugger Robot [Tue, 2 Apr 2019 00:42:42 +0000 (00:42 +0000)]
Merge "Adds @NonNull to getChildSessionIds"
Chalard Jean [Tue, 2 Apr 2019 00:41:35 +0000 (17:41 -0700)]
Merge "Cleanup SystemReady in the network stack" am:
e0ef7ce4f7
am:
4b130e8567
Change-Id: Id1348ffa1406adf08b94eec18b3b1e6da40e84be
Jack He [Tue, 2 Apr 2019 00:40:49 +0000 (17:40 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors" am:
463454432b am:
39a6d731bb
am:
f08eadc878
Change-Id: I042170e4b06ee298c063a84c8f7aaabe58a4c0dd
Christopher Tate [Fri, 22 Feb 2019 01:41:37 +0000 (17:41 -0800)]
Batch the commit-to-disk of new persisted jobs
We aggressively commit persisted-job state changes to disk ASAP, but
this means that in some cases (both pathological and not) we wind up
redundantly writing the persisted-jobs description to disk multiple
times. Now we reduce the potential write load by batching together all
updates within a given time threshold into a single commit to disk.
Bug:
125441169
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/job/JobStoreTest.java
Change-Id: If7b544064f35dc6b0543b2ec979ae94afb5d6e33
Mathieu Chartier [Tue, 2 Apr 2019 00:32:46 +0000 (17:32 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am:
72e80b5b1a am:
efeaad3225
am:
e58f122e19
Change-Id: I40fc2836471279635acc26c06aa4a18a183947f9
TreeHugger Robot [Tue, 2 Apr 2019 00:29:32 +0000 (00:29 +0000)]
Merge "Replace bubble header with adaptive settings icon"
Hall Liu [Tue, 2 Apr 2019 00:24:01 +0000 (17:24 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI" am:
4c508d1b03
am:
d94791b712
Change-Id: I435a8b653960e07931bb8c0c11fad3f805431dc6
Jack He [Tue, 2 Apr 2019 00:18:16 +0000 (17:18 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors" am:
463454432b
am:
39a6d731bb
Change-Id: If1410685d139f44a87648bfdb87094cd30ec8462
Remi NGUYEN VAN [Tue, 26 Mar 2019 08:24:48 +0000 (17:24 +0900)]
Rename NetworkStackPermissionStub
Use NetworkStackPermissionConfig instead.
Bug:
129317412
Test: Flashed, booted, WiFi working
Merged-In: I7bdc058dddfa483823074055ad5c9d7d2efd37b9
Change-Id: I45299c12598cd3b33bfd78ae8698d98b77b18dc0
TreeHugger Robot [Tue, 2 Apr 2019 00:13:19 +0000 (00:13 +0000)]
Merge "AAPT2: Delete dead code"
Chalard Jean [Tue, 2 Apr 2019 00:12:06 +0000 (17:12 -0700)]
Merge "Cleanup SystemReady in the network stack"
am:
e0ef7ce4f7
Change-Id: I1a55078b74d5f94afde94da0dc5f6e1d2af10de3
Mathieu Chartier [Tue, 2 Apr 2019 00:11:04 +0000 (17:11 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists" am:
72e80b5b1a
am:
efeaad3225
Change-Id: I16ff57136a2f53e97b494c866ac3497e00996823
Remi NGUYEN VAN [Tue, 2 Apr 2019 00:10:19 +0000 (00:10 +0000)]
Merge "Rename NetworkStackPermissionStub"
Philip P. Moltmann [Mon, 1 Apr 2019 23:45:23 +0000 (23:45 +0000)]
Merge "Remove dual storage permission model"
Hall Liu [Mon, 1 Apr 2019 23:34:30 +0000 (16:34 -0700)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
am:
4c508d1b03
Change-Id: I1b3c96de78b909dab372e3e3745c877b8becd2d6
Philip P. Moltmann [Wed, 27 Mar 2019 19:24:45 +0000 (12:24 -0700)]
Remove dual storage permission model
- Also remove typed media permissions
- Leave typed media app-ops
Bug:
129716569
Test: Used apps, looked at permissions in the UI
Change-Id: If7714fb1a6955584157e1a60ab72b09e35287827
Jack He [Mon, 1 Apr 2019 23:29:30 +0000 (16:29 -0700)]
Merge "BluetoothHealth: hide auto-created default constructors"
am:
463454432b
Change-Id: I51d7f625dd2bcb81fec4bcf25822d1533cbc5cee
Chalard Jean [Mon, 1 Apr 2019 23:28:47 +0000 (23:28 +0000)]
Merge "Cleanup SystemReady in the network stack"
Jaewoong Jung [Mon, 1 Apr 2019 23:24:43 +0000 (16:24 -0700)]
[automerger skipped] Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp
am:
6a9a4a375b -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
9a7e79112d is in history
Change-Id: I39ac5cf2246711f23582dac5a20974acb9909254
Mathieu Chartier [Mon, 1 Apr 2019 23:24:14 +0000 (16:24 -0700)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
am:
72e80b5b1a
Change-Id: Iaf05e6a285dbf626854a3b37101bea032af3a7a8
TreeHugger Robot [Mon, 1 Apr 2019 23:16:07 +0000 (23:16 +0000)]
Merge "Increase logging level in GnssSatelliteBlacklistHelper"
Jaewoong Jung [Mon, 1 Apr 2019 23:13:09 +0000 (16:13 -0700)]
[automerger skipped] Revert "Convert Android.mk to Android.bp"
am:
cf2dcbaeeb -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
9a7e79112d is in history
Change-Id: Ib86de327bf5d87717fac4c0d10a0ae0da7899f70
Tony Mak [Mon, 1 Apr 2019 22:56:55 +0000 (23:56 +0100)]
Fix AndroidTest.xml
Test: Run run.sh
Change-Id: If9f088dccacd30313380bedba4f8731ca6b47477
Ahmed ElArabawy [Mon, 1 Apr 2019 22:57:54 +0000 (22:57 +0000)]
Merge "wifi.proto: Add WifiLock statistics"
Hall Liu [Mon, 1 Apr 2019 22:55:51 +0000 (22:55 +0000)]
Merge "Add a new carrier config to show the WFC location privacy policy UI"
Badhri Jagan Sridharan [Mon, 1 Apr 2019 22:54:39 +0000 (22:54 +0000)]
Merge "Only re-enable contaminant detection when port is present"
Jaewoong Jung [Mon, 1 Apr 2019 22:54:33 +0000 (22:54 +0000)]
Merge "Revert "Convert Android.mk to Android.bp"" into pi-dev-plus-aosp
Jaewoong Jung [Mon, 1 Apr 2019 22:43:03 +0000 (22:43 +0000)]
Revert "Convert Android.mk to Android.bp"
This reverts commit
9a7e79112d5d936ace862e565b7df724906ae1de.
Reason for revert: Broke builds
Change-Id: I45b2e49535a12272963a24f1e9f7ef25b31e5360
Merged-In: I80688006411dcf32f8f329556044d25ad12af1ac
TreeHugger Robot [Mon, 1 Apr 2019 22:41:44 +0000 (22:41 +0000)]
Merge "Fine tune app entites measurement"
Treehugger Robot [Mon, 1 Apr 2019 22:37:43 +0000 (22:37 +0000)]
Merge "BluetoothHealth: hide auto-created default constructors"
Android Build Merger (Role) [Mon, 1 Apr 2019 22:33:05 +0000 (22:33 +0000)]
Merge "[automerger skipped] Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp am:
306ab7ee28 -s ours am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
edfa8e90a1 is in history"
Jaewoong Jung [Mon, 1 Apr 2019 22:31:59 +0000 (15:31 -0700)]
[automerger skipped] Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp
am:
306ab7ee28 -s ours
am skip reason: change_id I80688006411dcf32f8f329556044d25ad12af1ac with SHA1
edfa8e90a1 is in history
Change-Id: Ic66dd5cad21c20db0b4e9fee747322c73080839c
TreeHugger Robot [Mon, 1 Apr 2019 22:30:43 +0000 (22:30 +0000)]
Merge "Move TextClassifierPerfTest to a separate package"
TreeHugger Robot [Mon, 1 Apr 2019 22:30:12 +0000 (22:30 +0000)]
Merge "Removing API to access app usage as it is no long public"
Svetoslav Ganov [Mon, 1 Apr 2019 22:30:03 +0000 (22:30 +0000)]
Merge "Add missing argument and return annotations"
Mathieu Chartier [Mon, 1 Apr 2019 22:29:07 +0000 (22:29 +0000)]
Merge "Pass debug.allocTracker.stackDepth to runtime if it exists"
Malcolm Chen [Thu, 21 Mar 2019 03:32:27 +0000 (20:32 -0700)]
API Feedback for CBRS
Bug:
128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Merged-In: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Svetoslav Ganov [Mon, 1 Apr 2019 22:12:35 +0000 (22:12 +0000)]
Merge "Add missing nullability annotations"
TreeHugger Robot [Mon, 1 Apr 2019 22:09:19 +0000 (22:09 +0000)]
Merge "Update javadoc on BatterySaverPolicyConfig"
TreeHugger Robot [Mon, 1 Apr 2019 22:07:07 +0000 (22:07 +0000)]
Merge "Add a "More" item for the new default apps list."
Jaewoong Jung [Mon, 1 Apr 2019 22:01:26 +0000 (22:01 +0000)]
Merge "Convert Android.mk to Android.bp" into pi-dev-plus-aosp
TreeHugger Robot [Mon, 1 Apr 2019 21:57:57 +0000 (21:57 +0000)]
Merge "Enable presubmit for idmap2_tests"
Beverly [Mon, 1 Apr 2019 21:49:41 +0000 (17:49 -0400)]
Fix flaky test on daylight savings
When it's daylight savings, the one day offset also
adds another hour to the calendar. This made it so that the
"now" time in the test was no longer within the schedule times
so the test would fail. This sets the "now" time so that it will
still be within the schedule even with the daylight savings hour.
Test: atest ScheduleCalendarTest
Fixes:
128296836
Change-Id: Ifc8791a45bf1bb875cb7a91869363f8995f1cdc4
Xiangyu/Malcolm Chen [Mon, 1 Apr 2019 21:47:40 +0000 (14:47 -0700)]
[automerger skipped] Merge "Remove clearDefaultsForInactiveSubIds." am:
1e263e7bc0 am:
4e32ac7754
am:
65d4295c3c -s ours
am skip reason: change_id Ib7bc0ae6dba6f10e3a052df1644cc77dd30121a9 with SHA1
c4c05b6d92 is in history
Change-Id: Idc2aa9fe31c0a9d03505bcd9f62af4344066d35d
Lyn Han [Fri, 29 Mar 2019 23:46:07 +0000 (16:46 -0700)]
Replace bubble header with adaptive settings icon
Bug:
128010178
Test: manual
Change-Id: Ia0a0f72d7ed1da3fd7dbdcff235cf0bcb39100c4
Android Build Merger (Role) [Mon, 1 Apr 2019 21:37:56 +0000 (21:37 +0000)]
Merge changes from topic "am-
002ad919bad249f3b11d8215de81b6c6"
* changes:
[automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am:
f276a56215 am:
7e3864bc99 am:
e53008bed5 -s ours am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1
9cf3e7ae68 is in history
Allow requestNetworkScan to return sanitized info am:
c9d7430685 am:
87217889f1 am:
9e1d425b58
Hall Liu [Mon, 1 Apr 2019 21:35:46 +0000 (14:35 -0700)]
[automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am:
f276a56215 am:
7e3864bc99
am:
e53008bed5 -s ours
am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1
9cf3e7ae68 is in history
Change-Id: I0e7d646a5f4f5522df471df5ec921e63fff81a38
TreeHugger Robot [Mon, 1 Apr 2019 21:34:26 +0000 (21:34 +0000)]
Merge "Update icon packs."