OSDN Git Service
Android Build Merger (Role) [Mon, 26 Mar 2018 20:40:48 +0000 (20:40 +0000)]
Merge "[automerger skipped]Merge "Add new trace tag for AIDL." am:
fe3877f140 am:
c040ffd288 -s ours" into pi-dev-plus-aosp
Martijn Coenen [Mon, 26 Mar 2018 20:38:34 +0000 (20:38 +0000)]
[automerger skipped]Merge "Add new trace tag for AIDL." am:
fe3877f140
am:
c040ffd288 -s ours
Change-Id: I6e5fb41fc029498229f273e02d6c039b539cafbf
Svetoslav Ganov [Mon, 26 Mar 2018 20:37:01 +0000 (20:37 +0000)]
Merge "Add missing null check" into pi-dev
am:
8eef782e32
Change-Id: I65f07944eebe45d867f1b8250cd034dcfffd2816
Kweku Adams [Mon, 26 Mar 2018 20:26:48 +0000 (20:26 +0000)]
Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev
am:
cff4c5492e
Change-Id: If5bbf71d879484ad21e6e8d1222b31cde404b8af
Martijn Coenen [Mon, 26 Mar 2018 20:26:18 +0000 (20:26 +0000)]
Merge "Add new trace tag for AIDL."
am:
fe3877f140
Change-Id: I7aced8041cb8859b0a26db157e7626045e17a006
Svetoslav Ganov [Mon, 26 Mar 2018 20:18:45 +0000 (20:18 +0000)]
Merge "Add missing null check" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 20:11:09 +0000 (20:11 +0000)]
Merge "Refactoring GlobalSettingsProto to avoid method limit." into pi-dev
Robert Berry [Mon, 26 Mar 2018 19:35:20 +0000 (19:35 +0000)]
Merge "Fix setServerParams to not always set snapshot pending" into pi-dev
am:
54419ca2bb
Change-Id: I15092dbcc5b328d71e3f93d92963583a54d78d54
Selim Cinek [Mon, 26 Mar 2018 19:30:43 +0000 (19:30 +0000)]
Merge "Translating the icon in the shelf with the notification" into pi-dev
am:
5b154cee04
Change-Id: I2f7fd1d685c3a90a4a55c2f66c3ef412fd24c2ee
Robert Berry [Mon, 26 Mar 2018 19:18:52 +0000 (19:18 +0000)]
Merge "Fix setServerParams to not always set snapshot pending" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 19:14:36 +0000 (19:14 +0000)]
Merge "Translating the icon in the shelf with the notification" into pi-dev
Martijn Coenen [Mon, 26 Mar 2018 19:00:57 +0000 (19:00 +0000)]
Merge "Add new trace tag for AIDL."
yuemingw [Mon, 26 Mar 2018 18:03:20 +0000 (18:03 +0000)]
Merge "Better javadoc and rename several methods in ApnSetting." am:
5d9544cbea
am:
2e8ebcf09b
Change-Id: I0e8f612efcbcc36c17a1f543af5e488b1a83d1b8
yuemingw [Mon, 26 Mar 2018 17:56:19 +0000 (17:56 +0000)]
Merge "Better javadoc and rename several methods in ApnSetting."
am:
5d9544cbea
Change-Id: I0f3ebf286462641d2c86ebffd49d95ce30056662
Tej Singh [Mon, 26 Mar 2018 17:39:50 +0000 (17:39 +0000)]
[automerger skipped]Merge "Logging: Bluetooth Enabled" into pi-dev
am:
294ad78534 -s ours
Change-Id: Iffa3a5c6bf25085340dd5823704c70fadf172eee
Tej Singh [Mon, 26 Mar 2018 17:27:52 +0000 (17:27 +0000)]
Merge "Logging: Bluetooth Enabled" into pi-dev
Tony Mak [Mon, 26 Mar 2018 17:15:29 +0000 (17:15 +0000)]
Merge "Get application info in the correct user id" into pi-dev
am:
df75309281
Change-Id: I763a8fae339cb9ca56b713c695d3e97e3c46c3d5
Tony Mak [Mon, 26 Mar 2018 17:04:47 +0000 (17:04 +0000)]
Merge "Get application info in the correct user id" into pi-dev
Ricky Wai [Mon, 26 Mar 2018 17:01:45 +0000 (17:01 +0000)]
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
am:
e1c76d71e7
Change-Id: Ic3de4d136a995a8291fb43c780a311e423aeb9b7
Michael West [Mon, 26 Mar 2018 16:51:00 +0000 (16:51 +0000)]
Merge "add airplane mode shell commands to connectivity" into pi-dev
am:
54fd127590
Change-Id: I81fd444f1364c394d17759c261798b3a3f85b826
Ricky Wai [Mon, 26 Mar 2018 16:46:20 +0000 (16:46 +0000)]
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
Michael West [Mon, 26 Mar 2018 16:38:03 +0000 (16:38 +0000)]
Merge "add airplane mode shell commands to connectivity" into pi-dev
Amith Yamasani [Mon, 26 Mar 2018 16:34:48 +0000 (16:34 +0000)]
Merge "Shorter bucket elevation for system_interaction and sync_adapter" into pi-dev
am:
461a71a5fa
Change-Id: I8ff0e9fd5f73dbce2709381207222d8fa673418a
Treehugger Robot [Mon, 26 Mar 2018 16:28:58 +0000 (16:28 +0000)]
Merge "Better javadoc and rename several methods in ApnSetting."
yuemingw [Wed, 21 Mar 2018 15:20:43 +0000 (15:20 +0000)]
Better javadoc and rename several methods in ApnSetting.
Cherrypicked from ag/
3709855.
Test: Manually by TestDpc
Bug:
73087996
Merged-In: I5232c92a44ab505946956f81965a205f170aa52b
Jack He [Mon, 26 Mar 2018 16:23:30 +0000 (16:23 +0000)]
Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev
am:
0aeb374380
Change-Id: I469475c793e5e04f3550d959415ff04c22da6952
Amith Yamasani [Mon, 26 Mar 2018 16:17:33 +0000 (16:17 +0000)]
Merge "Shorter bucket elevation for system_interaction and sync_adapter" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 16:06:22 +0000 (16:06 +0000)]
Merge "AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString" into pi-dev
Jeff Sharkey [Mon, 26 Mar 2018 15:20:01 +0000 (15:20 +0000)]
Merge "Clear identity when asking for other users." into pi-dev
am:
8eaee9eea5
Change-Id: I64d1f725fe0653ef4512e73d92f411de78664989
Stanley Tng [Mon, 26 Mar 2018 15:12:34 +0000 (15:12 +0000)]
Merge changes from topic "cleanup-ble-app-list-at-death" into pi-dev
am:
dd7efc3287
Change-Id: I5300155237985128a9a4447d2e95aec60def6891
TreeHugger Robot [Mon, 26 Mar 2018 15:06:28 +0000 (15:06 +0000)]
Merge "Clear identity when asking for other users." into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 15:03:19 +0000 (15:03 +0000)]
Merge changes from topic "cleanup-ble-app-list-at-death" into pi-dev
* changes:
Calls unlinkToDeath in binderDied to deregister
Remove BLE App entry from mBleApps list when App died
Julia Reynolds [Mon, 26 Mar 2018 14:47:48 +0000 (14:47 +0000)]
Merge "Consolidate logic for 'recent notifications'" into pi-dev
am:
ad06c5f603
Change-Id: Ie2347690b84d8bb9caf341ba2e2f8d0055735baf
Julia Reynolds [Mon, 26 Mar 2018 14:36:07 +0000 (14:36 +0000)]
Merge "Consolidate logic for 'recent notifications'" into pi-dev
Julien Desprez [Mon, 26 Mar 2018 13:59:52 +0000 (13:59 +0000)]
Merge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev
am:
b133cbfd0b
Change-Id: Ie0d9b0bc8ba702a9b54be2c690fe7de8d8820e02
Emilian Peev [Mon, 26 Mar 2018 13:50:36 +0000 (13:50 +0000)]
Merge changes from topic "executor_api" into pi-dev
am:
8cb2aba54d
Change-Id: I05c44edc448f83a023fe06f013433ec92b771b4d
Emilian Peev [Mon, 26 Mar 2018 13:46:48 +0000 (13:46 +0000)]
Camera: Async camera manager calls should use executors
am:
9129aa25c1
Change-Id: Idd12695a8cdd15522d167499deb7b119d5b7db45
Julien Desprez [Mon, 26 Mar 2018 13:45:45 +0000 (13:45 +0000)]
Merge "Add Osu2.apk to the AndroidTest so the tests have a target" into pi-dev
Beverly Tai [Mon, 26 Mar 2018 13:34:55 +0000 (13:34 +0000)]
Merge "Tweaks to wireless charging animation" into pi-dev
am:
361b809e08
Change-Id: I3efc3212fb6ba2cbdd3b3927954c2dbed3fa5a29
TreeHugger Robot [Mon, 26 Mar 2018 13:31:30 +0000 (13:31 +0000)]
Merge changes from topic "executor_api" into pi-dev
* changes:
Camera: Accept user-supplied executors in capture sessions
Camera: Async camera manager calls should use executors
Beverly Tai [Mon, 26 Mar 2018 13:22:07 +0000 (13:22 +0000)]
Merge "Tweaks to wireless charging animation" into pi-dev
Tony Mak [Mon, 26 Mar 2018 11:38:04 +0000 (12:38 +0100)]
Get application info in the correct user id
Fixes:
76396560
Test: Create work profile and launch hangouts in work profile.
Change-Id: Ic3727ac899153b6a96dd9b6d6921c32ba0bbd93e
Jaewan Kim [Mon, 26 Mar 2018 11:36:02 +0000 (11:36 +0000)]
Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev
am:
d21b33d8ca
Change-Id: Ic29104fbe78b9f3d022acaab7debdf1c9b38dd3a
Jaewan Kim [Mon, 26 Mar 2018 11:28:48 +0000 (11:28 +0000)]
Merge "MediaMetadata2: Remove radio constants" into pi-dev
am:
449e358fea
Change-Id: I11f2a0e3d6af1b9bf649aaed543f99e68af99043
Jaewan Kim [Mon, 26 Mar 2018 11:15:20 +0000 (11:15 +0000)]
Merge "MediaSession2: Revisit command code" into pi-dev
am:
ec0ab63ccb
Change-Id: I2827f7099008ebee00f9193e40258b74a0f5afec
David Brazdil [Mon, 26 Mar 2018 11:10:24 +0000 (11:10 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
am:
ab1abe1fe7
Change-Id: I8bdfadf38614b0a46545f564a03f6746263cafe4
Jaewan Kim [Mon, 26 Mar 2018 10:55:30 +0000 (10:55 +0000)]
Merge "MediaSession2: Change return type of CommandGroup#getCommands()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 10:53:24 +0000 (10:53 +0000)]
Merge "MediaMetadata2: Remove radio constants" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 10:52:22 +0000 (10:52 +0000)]
Merge "MediaSession2: Revisit command code" into pi-dev
TreeHugger Robot [Mon, 26 Mar 2018 10:49:21 +0000 (10:49 +0000)]
Merge "Add more hidden API uses to light greylist" into pi-dev
Robert Berry [Mon, 26 Mar 2018 10:36:40 +0000 (11:36 +0100)]
Fix setServerParams to not always set snapshot pending
Only updates should set snapshot pending. Setting the server params for
the first time should not set snapshot pending. If it did, then just
initializing the recovery agent would cause a snapshot to be made, even
if it contained no keys. Also, setting the snapshot to the same value as
it was previously should not set snapshot pending, for the exact same
reason. If the server params were to change, however, for some reason,
then a new snapshot must be made, so that it can be synced to the correct
vault.
Bug:
74949975
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: Ie09284553f922de869be7bcd577d0f0eb9d0bbd3
Benjamin Franz [Mon, 26 Mar 2018 09:29:29 +0000 (09:29 +0000)]
Merge "Expose hidden API to check whether a given package is state protected" into pi-dev
am:
3ff20e2257
Change-Id: I797fd24aff1afa3e37e6b5f4dbd93042b19ac369
Benjamin Franz [Mon, 26 Mar 2018 09:15:41 +0000 (09:15 +0000)]
Merge "Expose hidden API to check whether a given package is state protected" into pi-dev
David Brazdil [Mon, 26 Mar 2018 09:03:46 +0000 (10:03 +0100)]
Add more hidden API uses to light greylist
From bug reports.
Bug:
64382372
Bug:
76350169
Bug:
76329535
Bug:
76329536
Bug:
76355229
Bug:
76350172
Bug:
76384058
Bug:
76350170
Test: make
Change-Id: Id5f99235d0abc1a8326ed254dd835c9ac05dc996
Jaewan Kim [Mon, 26 Mar 2018 08:19:28 +0000 (08:19 +0000)]
Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev
am:
e711ebc4fa
Change-Id: I1a8a40b5e5a578af22f60a093c8259361addf7ba
Nicolas Geoffray [Mon, 26 Mar 2018 08:11:54 +0000 (08:11 +0000)]
Merge "Greylist camera API used by CameraITS test" into pi-dev
am:
3017136353
Change-Id: I7ee9b93ee5ce792338b17e5a3bc3942542196570
Jaewan Kim [Mon, 26 Mar 2018 08:10:44 +0000 (08:10 +0000)]
Merge "MediaSession2: Add CommandGroup#add/removeCommand(int)" into pi-dev
Jaewan Kim [Tue, 20 Mar 2018 07:19:07 +0000 (16:19 +0900)]
MediaSession2: Add CommandGroup#add/removeCommand(int)
Bug:
74648408
Test: Build
Change-Id: Icfcde5946e75ad74c2123be8064eb365366f5960
Jaewan Kim [Mon, 26 Mar 2018 05:13:37 +0000 (14:13 +0900)]
MediaMetadata2: Remove radio constants
Removeing radio constants until their names are finalized.
Bug:
75500592
Test: Build
Change-Id: I6f7a219c19dd24579a76c2064e9781ca53618c69
Nicolas Geoffray [Mon, 26 Mar 2018 08:03:10 +0000 (08:03 +0000)]
Merge "Add APIs to light grey." into pi-dev
am:
6b3e711eb4
Change-Id: I995f4a7476405cf536e94cc496790d28ef7f7eca
Martijn Coenen [Fri, 9 Mar 2018 08:26:54 +0000 (09:26 +0100)]
Add new trace tag for AIDL.
So we can auto-generate tracing code for AIDL interfaces.
Bug:
74416314
Test: inspect atrace output
Change-Id: I42eee24358763305d6b4e954087f3331ad20f9b7
Merged-In: I42eee24358763305d6b4e954087f3331ad20f9b7
Nicolas Geoffray [Mon, 26 Mar 2018 07:58:43 +0000 (07:58 +0000)]
Merge "Greylist camera API used by CameraITS test" into pi-dev
Nicolas Geoffray [Mon, 26 Mar 2018 07:53:38 +0000 (07:53 +0000)]
Merge "Add APIs to light grey." into pi-dev
Jaewan Kim [Tue, 20 Mar 2018 07:11:40 +0000 (16:11 +0900)]
MediaSession2: Change return type of CommandGroup#getCommands()
Bug:
74648408
Test: Build
Change-Id: I443dd0a1f244b285754561a4c485ef2e8530d42d
Jaewan Kim [Tue, 20 Mar 2018 08:06:01 +0000 (17:06 +0900)]
MediaSession2: Revisit command code
Bug:
74648408
Test: Build
Change-Id: I0c66d6dec7f5a25bd4c36aa6e2c140951ea38855
Jaewan Kim [Mon, 26 Mar 2018 05:28:46 +0000 (05:28 +0000)]
Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
am:
c92f8b4053
Change-Id: If507935451775e59e30465a48df8f6c5dc0a8050
Jaewan Kim [Mon, 26 Mar 2018 05:16:59 +0000 (05:16 +0000)]
Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev
am:
a6ba53d69d
Change-Id: Id3e25aa4e9f71d646f263de372901fbd35e81569
Jaewan Kim [Mon, 26 Mar 2018 05:12:17 +0000 (05:12 +0000)]
Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 04:57:48 +0000 (04:57 +0000)]
Merge "MediaPlayerBase: Add PlayerEventCallback#onPlaybackSpeedChanged()" into pi-dev
Amith Yamasani [Mon, 26 Mar 2018 04:55:50 +0000 (21:55 -0700)]
Shorter bucket elevation for system_interaction and sync_adapter
Don't keep the app in ACTIVE for too long after an indirect
use of the app. Also don't mark as used, so bucketing algorithm
can override quickly.
Bug:
74340258
Test: atest AppStandbyControllerTests
Change-Id: I3b8014873aaf881de07304b64039da211a63a525
Jeff Sharkey [Mon, 26 Mar 2018 04:53:29 +0000 (22:53 -0600)]
Clear identity when asking for other users.
Bug:
76394640
Test: nope
Change-Id: I8d1530ed01669947e91725e905240729e31c7234
Dmitry Dementyev [Mon, 26 Mar 2018 02:43:28 +0000 (02:43 +0000)]
Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
am:
a5b29ffffe
Change-Id: Ida09ae3747db332fcaa4ccb8a2bb774c96ce0caf
Jaewan Kim [Mon, 26 Mar 2018 02:26:14 +0000 (02:26 +0000)]
Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev
am:
c4f56a6be5
Change-Id: Ifd0c8a4c07ee3ccb7b377cff486e67801750a7ee
Dmitry Dementyev [Mon, 26 Mar 2018 02:18:33 +0000 (02:18 +0000)]
Merge "Remove unimplemented RecoverableKeystoreManager APIs." into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 02:07:57 +0000 (02:07 +0000)]
Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 01:51:04 +0000 (01:51 +0000)]
Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev
am:
46c07f3bd3
Change-Id: I0ca72ddccf04ddc7ba5f1183a503d582dee733ad
Jaewan Kim [Mon, 26 Mar 2018 01:40:00 +0000 (01:40 +0000)]
Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev
am:
a7fac1c115
Change-Id: I2243ddbc461aa577374954e09b09489ec1b9fcd5
Jaewan Kim [Mon, 26 Mar 2018 01:31:54 +0000 (01:31 +0000)]
Merge "MediaPlaylistAgent: Add getMediaItem()" into pi-dev
Jaewan Kim [Mon, 26 Mar 2018 01:24:21 +0000 (01:24 +0000)]
Merge "MediaController2: Remove MediaPlaylistAgent in the ControllerCallback" into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 22:16:34 +0000 (22:16 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
am:
4b46d3e1e4
Change-Id: Ie509b2878708ec1e7466679f503ec73cc9288206
Jeff Sharkey [Sun, 25 Mar 2018 22:05:45 +0000 (22:05 +0000)]
Merge "Add UX string tweaks before string freeze." into pi-dev
Svetoslav Ganov [Sun, 25 Mar 2018 16:47:55 +0000 (16:47 +0000)]
Merge "Notify all affected UIDs for user/audio restriction changes" into pi-dev
am:
069aa9dce4
Change-Id: I661b94bbf31828963cd1b752fcdc457f72fa88b8
Svetoslav Ganov [Sun, 25 Mar 2018 16:32:54 +0000 (16:32 +0000)]
Merge "Notify all affected UIDs for user/audio restriction changes" into pi-dev
Jeff Sharkey [Sun, 25 Mar 2018 09:08:20 +0000 (03:08 -0600)]
Add UX string tweaks before string freeze.
Test: builds, boots
Bug:
76097999
Change-Id: I85e82a039d0b3b857257a3143a7b94de67ccada2
Suprabh Shukla [Sat, 24 Mar 2018 22:49:37 +0000 (22:49 +0000)]
Merge "Guarding collisions in TimeSparseArray" into pi-dev
am:
6da53af9c5
Change-Id: Ic8ba83876a867fc57100b33b47cd8ef51be39dfe
TreeHugger Robot [Sat, 24 Mar 2018 22:36:21 +0000 (22:36 +0000)]
Merge "Guarding collisions in TimeSparseArray" into pi-dev
Seigo Nonaka [Sat, 24 Mar 2018 21:20:11 +0000 (21:20 +0000)]
Merge "Fix BoringLayout with PrecomputedText" into pi-dev
am:
5dbb3fe124
Change-Id: Idd0927134ecf65e42ee53d0898a149ce66bc30e2
TreeHugger Robot [Sat, 24 Mar 2018 21:03:31 +0000 (21:03 +0000)]
Merge "Fix BoringLayout with PrecomputedText" into pi-dev
Chenjie Yu [Sat, 24 Mar 2018 16:41:14 +0000 (16:41 +0000)]
Merge "Fix StatsCompanionService sometimes can be null" into pi-dev
am:
c8ab224b2a
Change-Id: I600831c2369d5985c22d336e8915ae261b6dfb06
TreeHugger Robot [Sat, 24 Mar 2018 16:28:01 +0000 (16:28 +0000)]
Merge "Fix StatsCompanionService sometimes can be null" into pi-dev
Erik Kline [Sat, 24 Mar 2018 16:12:38 +0000 (16:12 +0000)]
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
am:
ca697c621e -s ours
Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270
TreeHugger Robot [Sat, 24 Mar 2018 15:58:42 +0000 (15:58 +0000)]
Merge "Pass all relevant resolver info to netd" into pi-dev
Jack He [Sat, 24 Mar 2018 07:21:16 +0000 (00:21 -0700)]
AudioSystem: Add case for FOR_VIBRATE_RINGING in forceUseUsageToString
Bug:
72647074
Test: make, dumpsys audio
Change-Id: Ieaf2bf0e0ef6624409d1e91d9a1d232726460fc7
Svet Ganov [Sat, 24 Mar 2018 07:04:38 +0000 (00:04 -0700)]
Add missing null check
Test: manual
Bug:
72442137
Change-Id: Id0dc9b7f624a9ee0061fc735ed0a2f2aefd8a954
Martijn Coenen [Sat, 24 Mar 2018 06:17:31 +0000 (06:17 +0000)]
Merge "Add new trace tag for AIDL." into pi-dev
am:
96b341e43a
Change-Id: I925f2dd25d8fab1ddbef77e69778b7b07c4c1120
Svet Ganov [Sat, 24 Mar 2018 06:07:10 +0000 (06:07 +0000)]
Merge "Don't warn finishing ops for gone packages" into pi-dev
am:
457bcefb65
Change-Id: I40155c6ad7ebb8c6c2fec78800c382523ade19db
Martijn Coenen [Sat, 24 Mar 2018 05:58:25 +0000 (05:58 +0000)]
Merge "Add new trace tag for AIDL." into pi-dev
TreeHugger Robot [Sat, 24 Mar 2018 05:51:16 +0000 (05:51 +0000)]
Merge "Don't warn finishing ops for gone packages" into pi-dev
Salvador Martinez [Sat, 24 Mar 2018 05:31:49 +0000 (05:31 +0000)]
Merge "Add strings needed for additional labels of wifi summary" into pi-dev
am:
f43923f009
Change-Id: I367aa574c48ec365c03ddcfbe8c116ce500e1980
TreeHugger Robot [Sat, 24 Mar 2018 05:22:28 +0000 (05:22 +0000)]
Merge "Add strings needed for additional labels of wifi summary" into pi-dev
OSDN Git Service
