git.osdn.net Git - android-x86/frameworks-base.git/log

Chet Haase [Thu, 29 Mar 2018 01:24:17 +0000 (01:24 +0000)]

Merge "Add targetSdk check around new LinearLayout weighted measure behavior"

Adam Bookatz [Thu, 29 Mar 2018 00:59:49 +0000 (00:59 +0000)]

Merge "Fix statsd ble scan logging" into pi-dev am: f50e78d8f7
am: e84e4239f4

Change-Id: I7d6131a38340edb856de2c92b2b12c321105efe2

commit | commitdiff | tree

Etan Cohen [Thu, 29 Mar 2018 00:55:14 +0000 (00:55 +0000)]

Merge "[RTT] Expose new public API for number of measurements" into pi-dev am: 8d2404d1cd
am: bbfa0175dc

Change-Id: Ic9977dd626e9b8931f3ec13170d66b3798c8ad31

commit | commitdiff | tree

Chris Wren [Thu, 29 Mar 2018 00:51:48 +0000 (00:51 +0000)]

Merge "fix SliceMetrics typo and disambiguate logTouch" into pi-dev am: 362b3522d1
am: 315c41b60c

Change-Id: Idc978ba5b214b2aa4fb553cf31544cbe893c4f19

commit | commitdiff | tree

Robert Berry [Thu, 29 Mar 2018 00:39:50 +0000 (00:39 +0000)]

Merge "Add autobackup XML support for test BackupTransport flag" into pi-dev am: 88f8de612d
am: 725f2dfe36

Change-Id: Id396e2e81f1610957c15bf2b10173c0d64308d4d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 29 Mar 2018 00:23:31 +0000 (00:23 +0000)]

Merge "Merge "Camera: Add MONOCHROME camera capability" into pi-dev am: 889b21d181 am: aa306f2788"

commit | commitdiff | tree

Shuzhen Wang [Thu, 29 Mar 2018 00:21:24 +0000 (00:21 +0000)]

Merge "Camera: Add MONOCHROME camera capability" into pi-dev am: 889b21d181
am: aa306f2788

Change-Id: Ic76dac7d28f89bb070321430710c9871c3167857

commit | commitdiff | tree

TreeHugger Robot [Thu, 29 Mar 2018 00:15:30 +0000 (00:15 +0000)]

Merge "Revert "Install for all on replace""

commit | commitdiff | tree

Abodunrinwa Toki [Thu, 29 Mar 2018 00:10:10 +0000 (00:10 +0000)]

Merge "Implement Stateful TextClassifier APIs." into pi-dev am: 119d10deb9
am: 12dea84530

Change-Id: I248b3ffff26747f3cb95b6caf44bfcbe8dae10a3

commit | commitdiff | tree

Mike Digman [Wed, 28 Mar 2018 23:55:02 +0000 (23:55 +0000)]

Merge "Make volume dialog only fade in/out in landscape" into pi-dev am: 07150c5d75
am: 5f2fd4b46b

Change-Id: Ic42ea9cb668d72f3be9a794c9df83f5b7844b310

commit | commitdiff | tree

Calin Juravle [Wed, 28 Mar 2018 23:51:34 +0000 (23:51 +0000)]

Merge "Convert compilation reason and filter to int-enum before logging" into pi-dev am: dedfd8fec7
am: 3f49339787

Change-Id: Id57d842c8c2075d07c6818e0528f1baa0a2fc6ae

commit | commitdiff | tree

Julia Reynolds [Wed, 28 Mar 2018 23:47:42 +0000 (23:47 +0000)]

Merge "Fix capitalization" into pi-dev am: ee7b704c9c
am: 39648636e2

Change-Id: Ibc1353bc083cf035df4e0d89ba4aae189b90c84b

commit | commitdiff | tree

Malcolm Chen [Wed, 28 Mar 2018 23:22:11 +0000 (23:22 +0000)]

Merge "Merge "Clean new TelephonyManager API." am: 8d8921d7fc am: a0706e3590" into pi-dev-plus-aosp
am: a1aa519da5

Change-Id: I8817fd2b8cb4ba45f56edf6e31426382320e3daa

commit | commitdiff | tree

Tej Singh [Wed, 28 Mar 2018 23:02:07 +0000 (23:02 +0000)]

Merge "Merge "Temperature atom: Use int instead of float." into pi-dev am: 31c807c987" into pi-dev-plus-aosp
am: 128da7c873

Change-Id: I3ad448137fce55ac5da0be114a78e63627ad05ff

commit | commitdiff | tree

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

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 28 Mar 2018 22:48:11 +0000 (22:48 +0000)]

Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am: 26ef7344c9" into pi-dev-plus-aosp
am: 77fca22044

Change-Id: Icc7994f8625023f2f5c9c76081e17b9d6d166f19

commit | commitdiff | tree

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

commit | commitdiff | tree

David Pursell [Wed, 28 Mar 2018 22:16:24 +0000 (22:16 +0000)]

Merge "Merge "MessageQueue: explicitly remove FD event listeners." am: b43daf5f7b am: 040587641b" into pi-dev-plus-aosp
am: 1058f42271

Change-Id: I5093ca0d576473f490347ab4244af11a2835d23a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sami Kyostila [Wed, 28 Mar 2018 21:51:25 +0000 (21:51 +0000)]

[automerger skipped] Merge "Merge "statsd: Pass alert and config id to Perfetto" into pi-dev am: 66cb4e2871" into pi-dev-plus-aosp
am: 380d6781ca -s ours

Change-Id: I71ae13da882900a5af18c0c556e338ff3a863d7b

commit | commitdiff | tree

Adam Bookatz [Wed, 28 Mar 2018 21:49:29 +0000 (21:49 +0000)]

Merge "Fix statsd ble scan logging" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stan Iliev [Wed, 28 Mar 2018 21:38:08 +0000 (21:38 +0000)]

Merge "Merge "Better error reporting for createOrUpdateLayer" into pi-dev am: 67a58660b9" into pi-dev-plus-aosp
am: 0bb7fbe729

Change-Id: I722510bbf527f1dd4eb323bf4be48653eb3562cc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Brad Ebinger [Wed, 28 Mar 2018 21:28:13 +0000 (21:28 +0000)]

[automerger skipped] Merge "Parse SMS locally upon error to get message ref" am: 7a5653599c am: 06cdcab7ba -s ours
am: 1a7aec528b -s ours

Change-Id: I3136490811eddadbec6ad3605c74105b76c4b37d

commit | commitdiff | tree

Patrick Baumann [Wed, 28 Mar 2018 21:25:57 +0000 (21:25 +0000)]

Revert "Install for all on replace"

This reverts commit dccef33d901398b1f39a8fea4dd919d57c5643f2.

Reason for revert: Breaks ADB install disabled setting

Change-Id: Icad438c592eb8e3be2a321e41fd75f9d577b002f

commit | commitdiff | tree

Julia Reynolds [Wed, 28 Mar 2018 21:25:15 +0000 (21:25 +0000)]

Merge "Fix capitalization" into pi-dev
am: ee7b704c9c

Change-Id: I98aec0ddbd83d78bf7775077c013fe2d9b7956be

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 21:18:33 +0000 (21:18 +0000)]

Merge "fix SliceMetrics typo and disambiguate logTouch" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Etan Cohen [Wed, 28 Mar 2018 21:08:10 +0000 (21:08 +0000)]

Merge "[RTT] Add API for number of measurements" into pi-dev am: d1c5b6695f
am: 80b9e35dce

Change-Id: I8070b2464da26a75a50d821746b6a181fb8ece91

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 28 Mar 2018 21:03:40 +0000 (21:03 +0000)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7c862d461c -s ours
am: 474c7891df -s ours

Change-Id: I559909d91a34adaaa61830a6ae6b23e2e5658556

commit | commitdiff | tree

Yi Jin [Wed, 28 Mar 2018 21:03:11 +0000 (21:03 +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
am: 0310f0e2cf

Change-Id: Ic4aa59b4c253b4a42cf5d4dbafa94fa071cfb4eb

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 21:01:31 +0000 (21:01 +0000)]

Merge "Camera: Add MONOCHROME camera capability" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Abodunrinwa Toki [Wed, 28 Mar 2018 20:58:47 +0000 (20:58 +0000)]

Merge "Implement Stateful TextClassifier APIs." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Malcolm Chen [Wed, 28 Mar 2018 20:47:45 +0000 (20:47 +0000)]

Merge "Clean new TelephonyManager API."
am: 8d8921d7fc

Change-Id: I6a6ffe87a6b19f5723da955308ec39c83ed5aca3

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chenjie Yu [Wed, 28 Mar 2018 20:41:36 +0000 (20:41 +0000)]

Merge "Fix typo on pull alarm broadcast receiver" into pi-dev am: e100329647
am: 5ae0e340c3

Change-Id: I7895d7605f59e27084cf2a816584ed04a22d5067

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Salvador Martinez [Wed, 28 Mar 2018 20:35:28 +0000 (20:35 +0000)]

Merge "Update wifi header summary text to show metered state" into pi-dev am: 740d37193f
am: 93dc7a4519

Change-Id: Ica76339e7efe675d481a96c50b83f17a1236dd35

commit | commitdiff | tree

Julia Reynolds [Wed, 28 Mar 2018 20:35:11 +0000 (20:35 +0000)]

Merge "Fix capitalization" into pi-dev

commit | commitdiff | tree

Tej Singh [Wed, 28 Mar 2018 20:33:44 +0000 (20:33 +0000)]

Merge "Temperature atom: Use int instead of float." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jean-Michel Trivi [Wed, 28 Mar 2018 20:30:02 +0000 (20:30 +0000)]

Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 20:28:59 +0000 (20:28 +0000)]

Merge "Better error reporting for createOrUpdateLayer" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Nicolas Geoffray [Wed, 28 Mar 2018 20:27:10 +0000 (20:27 +0000)]

Merge "Add new Wifi API to light grey." into pi-dev am: 0bc998b32f
am: 3301a0380b

Change-Id: Iab1f9777ec32fbc42e4ae1f0c9ed5e38e76bef55

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 20:12:24 +0000 (20:12 +0000)]

Merge "[RTT] Add API for number of measurements" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 20:06:18 +0000 (20:06 +0000)]

Merge "Import translations. DO NOT MERGE" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Wed, 28 Mar 2018 20:03:21 +0000 (20:03 +0000)]

Merge "Add different animation for transitions with translucent apps" into pi-dev am: 13c4b14e92
am: 162b5e89ec

Change-Id: Id1eded5e514f0444f697fe52730e39af593aaba4

commit | commitdiff | tree

Dmitry Dementyev [Wed, 28 Mar 2018 19:59:17 +0000 (19:59 +0000)]

Merge "Use rootAlias to index chosen cert and its version." into pi-dev am: 52bc5f2ae1
am: 4120a4d040

Change-Id: Icebea14c938768fa7db6e55e357b9882b6697f96

commit | commitdiff | tree

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

commit | commitdiff | tree

Mohamed Abdalkader [Wed, 28 Mar 2018 19:55:50 +0000 (19:55 +0000)]

Merge "Grant CONTACT permissions to IMS package." into pi-dev am: a21c304be5
am: 581ae181f2

Change-Id: Ic4872fda5f610706818f9e941a81f759520da4af

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 19:44:26 +0000 (19:44 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Pavel Grafov [Wed, 28 Mar 2018 19:40:31 +0000 (19:40 +0000)]

Merge "Improve javadoc for DISALLOW_DEBUGGING_FEATURES."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Felipe Leme [Wed, 28 Mar 2018 19:37:45 +0000 (19:37 +0000)]

Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev am: b8c00934cb
am: 09da1990a7

Change-Id: I54351c8462cb9030d52707d2a8df5b10d36f54fd

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 19:33:19 +0000 (19:33 +0000)]

Merge "Fix typo on pull alarm broadcast receiver" into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Vishwath Mohan [Wed, 28 Mar 2018 19:19:40 +0000 (19:19 +0000)]

Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev am: 86ed912f5a
am: 77b5ccb59b

Change-Id: I6de587d85c7ece9a20613ab935fca6f886dbc1c3

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 19:14:49 +0000 (19:14 +0000)]

Merge "Add new Wifi API to light grey." into pi-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 28 Mar 2018 19:08:04 +0000 (19:08 +0000)]

Merge "Merge "Use commas to separate API exemptions list, not colon." am: 2fddfcdced am: 9f85ad8c99 am: 33be0a8ca3"

commit | commitdiff | tree

Mathew Inwood [Wed, 28 Mar 2018 19:07:36 +0000 (19:07 +0000)]

Merge "Use commas to separate API exemptions list, not colon." am: 2fddfcdced am: 9f85ad8c99
am: 33be0a8ca3

Change-Id: I00af79a43f37957ff30944f8b9bb1a81a26a9fa9

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 19:06:43 +0000 (19:06 +0000)]

Merge "Add NtpTimeHelper"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 18:57:50 +0000 (18:57 +0000)]

Merge "Grant CONTACT permissions to IMS package." into pi-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 28 Mar 2018 18:54:38 +0000 (18:54 +0000)]

Merge "Fixed autofill dataset picker so header and footer are sticky." into pi-dev

commit | commitdiff | tree

Myles Watson [Wed, 28 Mar 2018 18:53:26 +0000 (18:53 +0000)]

[automerger skipped] Merge "Tell the user to toggle Bluetooth when enabling HCI logs" into pi-dev am: 8dfb334264 -s ours
am: 1edf1e19cf -s ours

Change-Id: I3a0bbdea63cf0325755eb20e7cc2ee2f8db07510

commit | commitdiff | tree

Mathew Inwood [Wed, 28 Mar 2018 18:46:42 +0000 (18:46 +0000)]

Merge "Use commas to separate API exemptions list, not colon." am: 2fddfcdced
am: 9f85ad8c99

Change-Id: Idc8adc6ccc505b1264cc8e26c76f067ae4abca1f

commit | commitdiff | tree

Vishwath Mohan [Wed, 28 Mar 2018 18:46:34 +0000 (18:46 +0000)]

Merge "Refactor FingerprintDialog to BiometricDialog" into pi-dev

commit | commitdiff | tree

Jerry Zhang [Wed, 28 Mar 2018 18:40:29 +0000 (18:40 +0000)]

Merge "Fix Unicode handling." into pi-dev am: 59f888d94c
am: c744ab4c30

Change-Id: I4a988f695a1653d05453dacf8fce21b288d63c1d

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Mar 2018 18:40:17 +0000 (18:40 +0000)]