OSDN Git Service
Hall Liu [Thu, 29 Mar 2018 01:38:25 +0000 (01:38 +0000)]
Merge "Add additional logging for EMBMS edge cases" am:
de57d0d024
am:
8b8591ce46
Change-Id: I0970e3a9eb83cd11c6bcbd014f6365e6c7884876
Holly Jiuyu Sun [Thu, 29 Mar 2018 01:32:20 +0000 (01:32 +0000)]
[automerger skipped] Merge "Address comments from API Review." am:
18e47b6108
am:
bdd350c036 -s ours
Change-Id: Icd78c8087d4056fa59f43e41b45b7fd97757a978
Hall Liu [Thu, 29 Mar 2018 01:25:09 +0000 (01:25 +0000)]
Merge "Add additional logging for EMBMS edge cases"
am:
de57d0d024
Change-Id: If9af4947275e18154c93d9d8f6756cac16317768
Holly Jiuyu Sun [Thu, 29 Mar 2018 01:22:38 +0000 (01:22 +0000)]
Merge "Address comments from API Review."
am:
18e47b6108
Change-Id: I3a4c1a0592df3b3c4f7625553bc9b92296da5c73
Ricky Wai [Thu, 29 Mar 2018 01:04:38 +0000 (01:04 +0000)]
Merge "Add adb command to force generate network watchlist report for testing" into pi-dev
am:
b0558905c5
Change-Id: Ie8b2062a62c2d64b7b67646236ec048cb9afcf6d
Mady Mellor [Thu, 29 Mar 2018 00:59:04 +0000 (00:59 +0000)]
Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev
am:
822dfea6ca
Change-Id: I3e366649169e6f7fa12f6ae31e7b0d72048b138d
Matthew Ng [Thu, 29 Mar 2018 00:55:05 +0000 (00:55 +0000)]
Merge "Opalayout can check quickstep icons without needing navbarview (1/2)" into pi-dev
am:
9822fffc7e
Change-Id: I1d3fefa6d6b81a5da6e1a9a4c75ad3036e609e3c
Lucas Dupin [Thu, 29 Mar 2018 00:51:29 +0000 (00:51 +0000)]
Merge "Use sentence case on "clear all" button" into pi-dev
am:
36a7eece58
Change-Id: I4f351534f902da625825b105a12277cedcbd47ae
Matthew Ng [Thu, 29 Mar 2018 00:38:56 +0000 (00:38 +0000)]
Merge "Ripple and opa diamond animation plays after a timeout (1/2)" into pi-dev
am:
6ef6c1603b
Change-Id: I64ce2301b7c9e38263d64b10a479698bfb4e68c4
Michael Wachenschwanz [Thu, 29 Mar 2018 00:11:25 +0000 (00:11 +0000)]
Merge "Change MeteredDataDisabled function names for clarity" into pi-dev
am:
631f55ba54
Change-Id: Icf55fa2d58a0d36c21e331f1756e3f05b3cc61f0
Ricky Wai [Thu, 29 Mar 2018 00:04:26 +0000 (00:04 +0000)]
Merge "Add adb command to force generate network watchlist report for testing" into pi-dev
Amin Shaikh [Thu, 29 Mar 2018 00:03:47 +0000 (00:03 +0000)]
Merge "Add vibrate/mute details to QS header." into pi-dev
am:
0a27c8d329
Change-Id: Ie6217a78cfc509af512205ed7a0205ca392d5642
TreeHugger Robot [Wed, 28 Mar 2018 23:59:37 +0000 (23:59 +0000)]
Merge "Fix keywords hint and add some hints and a subtype to Slice" into pi-dev
Philip P. Moltmann [Wed, 28 Mar 2018 23:58:59 +0000 (23:58 +0000)]
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
am:
a49954d3ab
Change-Id: Iae9b97679f75b37c3fa063af708ab7775c00b1b6
TreeHugger Robot [Wed, 28 Mar 2018 23:55:22 +0000 (23:55 +0000)]
Merge "Opalayout can check quickstep icons without needing navbarview (1/2)" into pi-dev
Andreas Huber [Wed, 28 Mar 2018 23:48:55 +0000 (23:48 +0000)]
Merge "Remove no longer needed workaround for new devices that previously" into pi-dev
am:
904c438135
Change-Id: I482d174ef346b44f91038bf8a65caa3ddac9d1a6
TreeHugger Robot [Wed, 28 Mar 2018 23:43:39 +0000 (23:43 +0000)]
Merge "Use sentence case on "clear all" button" into pi-dev
Sudheer Shanka [Wed, 28 Mar 2018 23:43:39 +0000 (23:43 +0000)]
Merge "Save internal state to disk after updating whitelist revoked uids." into pi-dev
am:
0302f56c8f
Change-Id: Ic1f27e5a4084964b61e07774af8b95bb36893079
TreeHugger Robot [Wed, 28 Mar 2018 23:39:47 +0000 (23:39 +0000)]
Merge "Ripple and opa diamond animation plays after a timeout (1/2)" into pi-dev
Felipe Leme [Wed, 28 Mar 2018 23:32:47 +0000 (23:32 +0000)]
Merge "Created framework resource for autofill_max_visible_datasets." into pi-dev
am:
e845d664d1
Change-Id: Ib0892ee7d8bc88325f0403e2809f4c25e818e367
TreeHugger Robot [Wed, 28 Mar 2018 23:18:01 +0000 (23:18 +0000)]
Merge "Change MeteredDataDisabled function names for clarity" into pi-dev
Android Build Merger (Role) [Wed, 28 Mar 2018 23:17:07 +0000 (23:17 +0000)]
Merge "[automerger skipped] Merge "Remove non-tombstoned ANR path." am:
ff95c80198 am:
750409de36 -s ours" into pi-dev-plus-aosp
Elliott Hughes [Wed, 28 Mar 2018 23:16:43 +0000 (23:16 +0000)]
[automerger skipped] Merge "Remove non-tombstoned ANR path." am:
ff95c80198
am:
750409de36 -s ours
Change-Id: I8889ec4d76eaec5bccd8c375ced94fa662fabc4a
yuemingw [Wed, 28 Mar 2018 23:15:07 +0000 (23:15 +0000)]
Merge "Intent.ACTION_AIRPLANE_MODE_CHANGED should have a boolean extra." into pi-dev
am:
e9b491bd37
Change-Id: I2fcc2320165fc4ffa8b44f4f891b85c43284e424
Joshua Baxter [Wed, 28 Mar 2018 23:08:09 +0000 (23:08 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev am:
651ffd426c
am:
9a2d959eff
Change-Id: I02788adeb444186d8d9e0471fe326d090d9199d7
Elliott Hughes [Wed, 28 Mar 2018 23:03:55 +0000 (23:03 +0000)]
Merge "Remove non-tombstoned ANR path."
am:
ff95c80198
Change-Id: Ifdf565635e1707822794d88db7117ca5ac986d1d
TreeHugger Robot [Wed, 28 Mar 2018 23:02:26 +0000 (23:02 +0000)]
Merge "Add vibrate/mute details to QS header." into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 23:02:04 +0000 (23:02 +0000)]
Merge "A18y: Don't double announce 'searching for printers.'" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 23:00:35 +0000 (23:00 +0000)]
Merge "Remove no longer needed workaround for new devices that previously" into pi-dev
Sudheer Shanka [Wed, 28 Mar 2018 22:56:13 +0000 (22:56 +0000)]
Merge "Save internal state to disk after updating whitelist revoked uids." into pi-dev
Matthew Ng [Wed, 28 Mar 2018 21:02:00 +0000 (14:02 -0700)]
Opalayout can check quickstep icons without needing navbarview (1/2)
Opalayout should not need NavigationBarView to determine if the icon
should be for quickstep icons. It does not need to know if recents is
disabled because of lock tasks and so the check is now in
OverviewProxyService. Then when Opalayout needs to layout the home
button it should be able to get the information regardless if
NavigationBarView is available or not.
Bug:
76210393
Fixes:
76434966
Fixes:
74071465
Test: change language in settings
Change-Id: I246175c3e2d5c990da6823df4108d48522b258bd
Adam Bookatz [Wed, 28 Mar 2018 22:51:50 +0000 (22:51 +0000)]
Merge "Fix statsd ble scan logging" into pi-dev
am:
f50e78d8f7
Change-Id: I5e3ab9952a44d51479389360fbed9dcfb548a8e2
Etan Cohen [Wed, 28 Mar 2018 22:41:25 +0000 (22:41 +0000)]
Merge "[RTT] Expose new public API for number of measurements" into pi-dev
am:
8d2404d1cd
Change-Id: I3418b5cae24457dd77b8573926b264c8e209c161
TreeHugger Robot [Wed, 28 Mar 2018 22:39:29 +0000 (22:39 +0000)]
Merge "Created framework resource for autofill_max_visible_datasets." into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 22:31:46 +0000 (22:31 +0000)]
Merge "Intent.ACTION_AIRPLANE_MODE_CHANGED should have a boolean extra." into pi-dev
Hall Liu [Wed, 28 Mar 2018 22:25:44 +0000 (22:25 +0000)]
Merge "Add additional logging for EMBMS edge cases"
Chris Wren [Wed, 28 Mar 2018 22:14:20 +0000 (22:14 +0000)]
Merge "fix SliceMetrics typo and disambiguate logTouch" into pi-dev
am:
362b3522d1
Change-Id: Id01778f18acba57ad19353e814fd0f8f278c3bc2
Robert Berry [Wed, 28 Mar 2018 22:09:02 +0000 (22:09 +0000)]
Merge "Add autobackup XML support for test BackupTransport flag" into pi-dev
am:
88f8de612d
Change-Id: I38aa9b19b3ed22376824dda753b0c30ef2df458e
Joshua Baxter [Wed, 28 Mar 2018 22:06:24 +0000 (22:06 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev
am:
651ffd426c
Change-Id: Ie6fb97aae76637023657d751f6ad0ebbc74ff284
Holly Jiuyu Sun [Wed, 28 Mar 2018 21:56:40 +0000 (21:56 +0000)]
Merge "Address comments from API Review."
Joshua Baxter [Wed, 28 Mar 2018 21:54:29 +0000 (21:54 +0000)]
Merge "docs: fixed a couple of typos" into oc-mr1-dev
Shuzhen Wang [Wed, 28 Mar 2018 21:53:26 +0000 (21:53 +0000)]
Merge "Camera: Add MONOCHROME camera capability" into pi-dev
am:
889b21d181
Change-Id: Ie84c255622923029ba546683274c76c7d3aa7ec6
Adam Bookatz [Wed, 28 Mar 2018 21:49:29 +0000 (21:49 +0000)]
Merge "Fix statsd ble scan logging" into pi-dev
Abodunrinwa Toki [Wed, 28 Mar 2018 21:41:36 +0000 (21:41 +0000)]
Merge "Implement Stateful TextClassifier APIs." into pi-dev
am:
119d10deb9
Change-Id: Ia627d4c265a585b14beebd98a3f6fb20d5d36eca
Etan Cohen [Wed, 28 Mar 2018 21:39:46 +0000 (21:39 +0000)]
Merge "[RTT] Expose new public API for number of measurements" into pi-dev
Mike Digman [Wed, 28 Mar 2018 21:36:13 +0000 (21:36 +0000)]
Merge "Make volume dialog only fade in/out in landscape" into pi-dev
am:
07150c5d75
Change-Id: Ic1db2e8a60fffd3d2265ceae14ae3775fe89f33c
Calin Juravle [Wed, 28 Mar 2018 21:32:39 +0000 (21:32 +0000)]
Merge "Convert compilation reason and filter to int-enum before logging" into pi-dev
am:
dedfd8fec7
Change-Id: Id147341527f602e2fa0d2a88f7e01281293d36a8
Julia Reynolds [Wed, 28 Mar 2018 21:25:15 +0000 (21:25 +0000)]
Merge "Fix capitalization" into pi-dev
am:
ee7b704c9c
Change-Id: I98aec0ddbd83d78bf7775077c013fe2d9b7956be
Treehugger Robot [Wed, 28 Mar 2018 21:25:13 +0000 (21:25 +0000)]
Merge "Remove non-tombstoned ANR path."
Amin Shaikh [Tue, 27 Mar 2018 20:55:43 +0000 (16:55 -0400)]
Add vibrate/mute details to QS header.
Change-Id: If9ee4129b8c64299d5bfe76e3db17415bc95d14a
Fixes:
76208830
Test: visual
TreeHugger Robot [Wed, 28 Mar 2018 21:18:33 +0000 (21:18 +0000)]
Merge "fix SliceMetrics typo and disambiguate logTouch" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 21:10:54 +0000 (21:10 +0000)]
Merge "Add autobackup XML support for test BackupTransport flag" into pi-dev
Android Build Merger (Role) [Wed, 28 Mar 2018 21:10:20 +0000 (21:10 +0000)]
Merge "Merge "Clean new TelephonyManager API." am:
8d8921d7fc am:
a0706e3590" into pi-dev-plus-aosp
Android Build Merger (Role) [Wed, 28 Mar 2018 21:09:59 +0000 (21:09 +0000)]
Merge "Merge "Temperature atom: Use int instead of float." into pi-dev am:
31c807c987" into pi-dev-plus-aosp
Malcolm Chen [Wed, 28 Mar 2018 21:09:36 +0000 (21:09 +0000)]
Merge "Clean new TelephonyManager API." am:
8d8921d7fc
am:
a0706e3590
Change-Id: I42b40c946923b2d8b767fec77c6f6b1c566abd72
Tej Singh [Wed, 28 Mar 2018 21:07:26 +0000 (21:07 +0000)]
Merge "Temperature atom: Use int instead of float." into pi-dev
am:
31c807c987
Change-Id: I736aa42f02e9d303fc76dca20349471a5219821d
Android Build Merger (Role) [Wed, 28 Mar 2018 21:01:51 +0000 (21:01 +0000)]
Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am:
26ef7344c9" into pi-dev-plus-aosp
TreeHugger Robot [Wed, 28 Mar 2018 21:01:31 +0000 (21:01 +0000)]
Merge "Camera: Add MONOCHROME camera capability" into pi-dev
Jean-Michel Trivi [Wed, 28 Mar 2018 21:01:24 +0000 (21:01 +0000)]
Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev
am:
26ef7344c9
Change-Id: If03bf4419f12a60afd0aed8c2d1ee52774c741d3
Android Build Merger (Role) [Wed, 28 Mar 2018 21:00:17 +0000 (21:00 +0000)]
Merge "Merge "MessageQueue: explicitly remove FD event listeners." am:
b43daf5f7b am:
040587641b" into pi-dev-plus-aosp
David Pursell [Wed, 28 Mar 2018 20:59:26 +0000 (20:59 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners." am:
b43daf5f7b
am:
040587641b
Change-Id: Ia4537ab0db75eabe8b3bf3fc07585a36769727f8
Android Build Merger (Role) [Wed, 28 Mar 2018 20:58:53 +0000 (20:58 +0000)]
Merge "Merge "statsd: Pass alert and config id to Perfetto" into pi-dev am:
66cb4e2871" into pi-dev-plus-aosp
Abodunrinwa Toki [Wed, 28 Mar 2018 20:58:47 +0000 (20:58 +0000)]
Merge "Implement Stateful TextClassifier APIs." into pi-dev
Sami Kyostila [Wed, 28 Mar 2018 20:58:27 +0000 (20:58 +0000)]
Merge "statsd: Pass alert and config id to Perfetto" into pi-dev
am:
66cb4e2871
Change-Id: Ia60905455eea9434f63435a0c6fd04276299e927
Android Build Merger (Role) [Wed, 28 Mar 2018 20:54:22 +0000 (20:54 +0000)]
Merge "Merge "Better error reporting for createOrUpdateLayer" into pi-dev am:
67a58660b9" into pi-dev-plus-aosp
Stan Iliev [Wed, 28 Mar 2018 20:53:54 +0000 (20:53 +0000)]
Merge "Better error reporting for createOrUpdateLayer" into pi-dev
am:
67a58660b9
Change-Id: I3f3bcf4d83fcb6210baecf3b7f4e4cc2d8ad996c
Brad Ebinger [Wed, 28 Mar 2018 20:52:29 +0000 (20:52 +0000)]
[automerger skipped] Merge "Parse SMS locally upon error to get message ref" am:
7a5653599c
am:
06cdcab7ba -s ours
Change-Id: Ic2c53def15379c202175a06b457b0a77b8872ddf
Malcolm Chen [Wed, 28 Mar 2018 20:47:45 +0000 (20:47 +0000)]
Merge "Clean new TelephonyManager API."
am:
8d8921d7fc
Change-Id: I6a6ffe87a6b19f5723da955308ec39c83ed5aca3
Mike Digman [Wed, 28 Mar 2018 20:46:20 +0000 (20:46 +0000)]
Merge "Make volume dialog only fade in/out in landscape" into pi-dev
David Pursell [Wed, 28 Mar 2018 20:43:07 +0000 (20:43 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners."
am:
b43daf5f7b
Change-Id: Ia6d04879f1007344d58ce9b9dbc5b1aeeafb1db7
Brad Ebinger [Wed, 28 Mar 2018 20:40:37 +0000 (20:40 +0000)]
Merge "Parse SMS locally upon error to get message ref"
am:
7a5653599c
Change-Id: I95d354c130697849e6a7953fdf4f089c557f5a4e
TreeHugger Robot [Wed, 28 Mar 2018 20:35:37 +0000 (20:35 +0000)]
Merge "Convert compilation reason and filter to int-enum before logging" into pi-dev
Julia Reynolds [Wed, 28 Mar 2018 20:35:11 +0000 (20:35 +0000)]
Merge "Fix capitalization" into pi-dev
Tej Singh [Wed, 28 Mar 2018 20:33:44 +0000 (20:33 +0000)]
Merge "Temperature atom: Use int instead of float." into pi-dev
Etan Cohen [Wed, 28 Mar 2018 20:33:31 +0000 (20:33 +0000)]
Merge "[RTT] Add API for number of measurements" into pi-dev
am:
d1c5b6695f
Change-Id: I75b5aa6eb2bea59ad8e022a00268b585a0de146c
Jean-Michel Trivi [Wed, 28 Mar 2018 20:30:02 +0000 (20:30 +0000)]
Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 20:29:31 +0000 (20:29 +0000)]
Merge "statsd: Pass alert and config id to Perfetto" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 20:28:59 +0000 (20:28 +0000)]
Merge "Better error reporting for createOrUpdateLayer" into pi-dev
Bill Yi [Wed, 28 Mar 2018 20:28:14 +0000 (20:28 +0000)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
7c862d461c -s ours
Change-Id: I192b22e7aaa4382365e22ff2d2b85b16aea21433
Lucas Dupin [Wed, 28 Mar 2018 20:26:54 +0000 (13:26 -0700)]
Use sentence case on "clear all" button
Test: visual
Change-Id: Id6e760d43c8798058253d636766fe3a7b577418e
Fixes:
77228015
Yi Jin [Wed, 28 Mar 2018 20:17:44 +0000 (20:17 +0000)]
Merge "Found out it is not possible to exec procrank as non-root/shell. But it is ok to disable procrank since the information can be obtain via dumpsys meminfo" into pi-dev
am:
ab34199e9c
Change-Id: I46c9c001ceac7a9283db1ccf9c0ba438d6f65120
Philip P. Moltmann [Wed, 28 Mar 2018 18:02:22 +0000 (11:02 -0700)]
A18y: Don't double announce 'searching for printers.'
Fixes:
67323891
Test: Navigated to screen with talkback
Change-Id: Iee4308fdc5c2ef53e2fde0004aa4f22f9bb8bef2
TreeHugger Robot [Wed, 28 Mar 2018 20:12:24 +0000 (20:12 +0000)]
Merge "[RTT] Add API for number of measurements" into pi-dev
Chenjie Yu [Wed, 28 Mar 2018 20:12:07 +0000 (20:12 +0000)]
Merge "Fix typo on pull alarm broadcast receiver" into pi-dev
am:
e100329647
Change-Id: I076b07d714b402c4b19dc8fdc947419d8da04d8b
TreeHugger Robot [Wed, 28 Mar 2018 20:06:18 +0000 (20:06 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Salvador Martinez [Wed, 28 Mar 2018 20:05:50 +0000 (20:05 +0000)]
Merge "Update wifi header summary text to show metered state" into pi-dev
am:
740d37193f
Change-Id: I2fe3ef92aa1def1aab8a28b29a862c7d9a708488
Nicolas Geoffray [Wed, 28 Mar 2018 19:57:49 +0000 (19:57 +0000)]
Merge "Add new Wifi API to light grey." into pi-dev
am:
0bc998b32f
Change-Id: I9e63bdeda0f2747ba414ad152115dda45d136ca1
Jorim Jaggi [Wed, 28 Mar 2018 19:39:34 +0000 (19:39 +0000)]
Merge "Add different animation for transitions with translucent apps" into pi-dev
am:
13c4b14e92
Change-Id: Ice110754fd73cfc576c89bec346792cdcdd9802b
TreeHugger Robot [Wed, 28 Mar 2018 19:37:46 +0000 (19:37 +0000)]
Merge "Found out it is not possible to exec procrank as non-root/shell. But it is ok to disable procrank since the information can be obtain via dumpsys meminfo" into pi-dev
Dmitry Dementyev [Wed, 28 Mar 2018 19:33:33 +0000 (19:33 +0000)]
Merge "Use rootAlias to index chosen cert and its version." into pi-dev
am:
52bc5f2ae1
Change-Id: Id3926848ae5fdad1851b4193319a08652642d1e6
TreeHugger Robot [Wed, 28 Mar 2018 19:33:19 +0000 (19:33 +0000)]
Merge "Fix typo on pull alarm broadcast receiver" into pi-dev
Mohamed Abdalkader [Wed, 28 Mar 2018 19:29:25 +0000 (19:29 +0000)]
Merge "Grant CONTACT permissions to IMS package." into pi-dev
am:
a21c304be5
Change-Id: I416b47c238599addefd7fca124897ea6541fcdff
Felipe Leme [Wed, 28 Mar 2018 19:20:02 +0000 (19:20 +0000)]
Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev
am:
b8c00934cb
Change-Id: Iea7cded56990ae09d5f60bbbc63978273092db6e
TreeHugger Robot [Wed, 28 Mar 2018 19:15:05 +0000 (19:15 +0000)]
Merge "Update wifi header summary text to show metered state" into pi-dev
TreeHugger Robot [Wed, 28 Mar 2018 19:14:49 +0000 (19:14 +0000)]
Merge "Add new Wifi API to light grey." into pi-dev
Andreas Huber [Wed, 28 Mar 2018 16:56:35 +0000 (09:56 -0700)]
Remove no longer needed workaround for new devices that previously
advertised a wrong Build.FIRST_SDK_INT. All devices shipped with P or
later now use the new /data/vendor_de storage location for fingerprint
data.
Bug:
72405644
Test: fingerprints work on device and are installed in data/vendor_de
Change-Id: I1031ca6f09ea712568716c0ba77c74730e239a7a
Jorim Jaggi [Wed, 28 Mar 2018 19:09:08 +0000 (19:09 +0000)]
Merge "Add different animation for transitions with translucent apps" into pi-dev
Felipe Leme [Wed, 28 Mar 2018 18:15:34 +0000 (11:15 -0700)]
Created framework resource for autofill_max_visible_datasets.
So it can be customized in a per-device basis...
Test: atest CtsAutoFillServiceTestCases
Bug:
69796626
Change-Id: I1dd617b7ae658dbff898ff5c9c0ee3fbf195a929
Dmitry Dementyev [Wed, 28 Mar 2018 19:05:21 +0000 (19:05 +0000)]
Merge "Use rootAlias to index chosen cert and its version." into pi-dev
Vishwath Mohan [Wed, 28 Mar 2018 19:01:11 +0000 (19:01 +0000)]
Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev
am:
86ed912f5a
Change-Id: I2582d4770900460a8d37c9d832e9a20583f9adf9
OSDN Git Service
