Charles Munger
d2db9aeebc
Merge "Deprecate Looper.prepareMainLooper" am: b1f69203e7
...
am: 8292d73554
2019-11-22 12:17:06 -08:00
Charles Munger
8292d73554
Merge "Deprecate Looper.prepareMainLooper"
...
am: b1f69203e7
2019-11-22 12:10:59 -08:00
Treehugger Robot
b1f69203e7
Merge "Deprecate Looper.prepareMainLooper"
2019-11-22 19:59:44 +00:00
Xin Li
d3a12aba2a
DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master
...
am: ddc6af7053
2019-11-22 11:09:43 -08:00
Xin Li
ddc6af7053
DO NOT MERGE - Skip QQ1A.191003.001 in stage-aosp-master
...
Bug: 144955631
Change-Id: I732bea5d874eede6a94ededba31b772c169ad247
2019-11-22 10:47:04 -08:00
Android Build Merger (Role)
dde4838774
Merge "Merge "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views are recreated when the device changes density." into qt-qpr1-dev am: 4ef328aee2" into qt-qpr1-dev-plus-aosp
2019-11-22 18:22:40 +00:00
Android Build Merger (Role)
6738dd98c7
Merge "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views are recreated when the device changes density. am: 13e6642243" into qt-qpr1-dev-plus-aosp
2019-11-22 18:22:34 +00:00
Jian-Yang Liu
e218b12d7d
Merge "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views are recreated when the device changes density." into qt-qpr1-dev
...
am: 4ef328aee2
2019-11-22 10:22:05 -08:00
JianYang Liu
24f9a9bbc3
DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views are recreated when the device changes density.
...
am: 13e6642243
2019-11-22 10:22:03 -08:00
Jayachandran Chinnakkannu
b52dfe672f
Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol" am: 4257da213d
...
am: d6900e4b3c
2019-11-22 10:22:02 -08:00
Ytai Ben-tsvi
dd682aacaf
Merge changes from topic "hidl-memory-java" am: 887aa66d0a
...
am: e74637df68
2019-11-22 10:16:39 -08:00
Jayachandran Chinnakkannu
d6900e4b3c
Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol"
...
am: 4257da213d
2019-11-22 10:15:56 -08:00
Ytai Ben-tsvi
e74637df68
Merge changes from topic "hidl-memory-java"
...
am: 887aa66d0a
2019-11-22 10:10:44 -08:00
Jian-Yang Liu
4ef328aee2
Merge "DO NOT MERGE Initialized ConfigurationController in CarStatusBar so that child views are recreated when the device changes density." into qt-qpr1-dev
2019-11-22 18:07:40 +00:00
Jayachandran Chinnakkannu
4257da213d
Merge "Remove usage of hidden API Emoji.isRegionalIndicatorSymbol"
2019-11-22 17:54:23 +00:00
Ytai Ben-tsvi
887aa66d0a
Merge changes from topic "hidl-memory-java"
...
* changes:
Add HidlMemoryUtil
Add parceling support for HIDL memory in Java
2019-11-22 17:54:06 +00:00
Paul Lawrence
e750086748
[automerger skipped] Merge "Use mContext directly, and enforce via logging" am: afb2c9e9cc -s ours
...
am: 3d3f98c5fe8c7f0100c7
2019-11-22 09:36:43 -08:00
Paul Lawrence
3d3f98c5fe
[automerger skipped] Merge "Use mContext directly, and enforce via logging"
...
am: afb2c9e9cc8c7f0100c7
2019-11-22 09:29:42 -08:00
Paul Lawrence
afb2c9e9cc
Merge "Use mContext directly, and enforce via logging"
2019-11-22 17:19:38 +00:00
David Castro
1294b8b570
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev am: 3b74a86752 am: 3a6d5555cd
...
am: 56be7c0b58
2019-11-22 09:09:15 -08:00
David Castro
56be7c0b58
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev am: 3b74a86752
...
am: 3a6d5555cd
2019-11-22 09:02:02 -08:00
Jovana Knezevic
be80fc48df
Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev
...
am: d7353d5c33
2019-11-22 08:55:27 -08:00
David Castro
3a6d5555cd
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev
...
am: 3b74a86752
2019-11-22 08:55:24 -08:00
Jovana Knezevic
d7353d5c33
Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev
2019-11-22 16:50:18 +00:00
TreeHugger Robot
3b74a86752
Merge "Removes reference to deprecated code sample, https://github.com/googlesamples/android-CustomChoiceList ." into qt-dev
2019-11-22 16:48:36 +00:00
David Castro
0f97261406
Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev am: 716edf3883 am: a9a4771159
...
am: b563d173d2
2019-11-22 08:39:56 -08:00
Kenny Root
93ea22120c
Merge "Make RecoverySystemService more testable" am: 49af39e751
...
am: 1b506101de
2019-11-22 08:33:14 -08:00
David Castro
b563d173d2
Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev am: 716edf3883
...
am: a9a4771159
2019-11-22 08:33:01 -08:00
Kenny Root
1b506101de
Merge "Make RecoverySystemService more testable"
...
am: 49af39e751
2019-11-22 08:27:49 -08:00
David Castro
a9a4771159
Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev
...
am: 716edf3883
2019-11-22 08:25:24 -08:00
Kenny Root
49af39e751
Merge "Make RecoverySystemService more testable"
2019-11-22 16:14:38 +00:00
David Castro
716edf3883
Merge "Expands on the definition of the timestamp parameter, as per clju@ in BUG:119380943." into qt-dev
2019-11-22 15:57:29 +00:00
Chalard Jean
eb24ef664f
Merge changes I195d894e,I7069c111 am: 87ed7d7816
...
am: aab1364ef9
2019-11-22 06:33:34 -08:00
Chalard Jean
aab1364ef9
Merge changes I195d894e,I7069c111
...
am: 87ed7d7816
2019-11-22 06:27:42 -08:00
Andrei-Valentin Onea
0c990f464c
[automerger skipped] Merge "Add metrics constant for platform compat UI." am: 48bb84c619 -s ours
...
am: c86bfb3390053191eae2
2019-11-22 06:12:48 -08:00
Chalard Jean
87ed7d7816
Merge changes I195d894e,I7069c111
...
* changes:
[NS A10] Cleanup
[NS A09] Always rematch all networks to requests
2019-11-22 14:08:09 +00:00
Andrei-Valentin Onea
c86bfb3390
[automerger skipped] Merge "Add metrics constant for platform compat UI."
...
am: 48bb84c619e9e83a5554
2019-11-22 06:06:46 -08:00
Govinda Wasserman
4b63818b1f
Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev
...
am: f924933058
2019-11-22 06:06:43 -08:00
Govinda Wasserman
f924933058
Merge "Rename PhenotypeHelper to DeviceConfigHelper" into qt-qpr1-dev
2019-11-22 13:27:32 +00:00
Andrei-Valentin Onea
48bb84c619
Merge "Add metrics constant for platform compat UI."
2019-11-22 13:02:44 +00:00
Aaron Huang
d78b2a0b67
Merge "Expose IpConfiguration and ProxyInfo APIs" am: 920a4a5b1b
...
am: 4082917f46
2019-11-22 01:47:14 -08:00
Aaron Huang
4082917f46
Merge "Expose IpConfiguration and ProxyInfo APIs"
...
am: 920a4a5b1b
2019-11-22 01:40:49 -08:00
Aaron Huang
920a4a5b1b
Merge "Expose IpConfiguration and ProxyInfo APIs"
2019-11-22 09:25:16 +00:00
Remi NGUYEN VAN
37ccd4c2e3
Merge "Move shared packages to NetworkStack project" am: 27253f29ad
...
am: 8a72e3d3b4
2019-11-21 23:22:11 -08:00
Remi NGUYEN VAN
8a72e3d3b4
Merge "Move shared packages to NetworkStack project"
...
am: 27253f29ad
2019-11-21 23:15:29 -08:00
Remi NGUYEN VAN
27253f29ad
Merge "Move shared packages to NetworkStack project"
2019-11-22 06:50:22 +00:00
David Castro
d52dd84fbf
Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev am: e3681d08e9 am: 0c8d339950
...
am: b69d94a847
2019-11-21 20:04:05 -08:00
Hai Shalom
f8a5719cfc
Merge "Revert submission" into qt-qpr1-dev
...
am: 65c9665125
2019-11-21 19:57:39 -08:00
David Castro
b69d94a847
Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev am: e3681d08e9
...
am: 0c8d339950
2019-11-21 19:53:56 -08:00
David Castro
0c8d339950
Merge "Updates the description of the provider parameter as per feedback in BUG:111695926." into qt-dev
...
am: e3681d08e9
2019-11-21 19:47:23 -08:00
