Pengquan Meng
|
a39b026ed7
|
Merge "Set default value to false for show4GForLte" am: 4d3f84fddb am: 9932eb7e22
am: adc6b190ff
Change-Id: If592a4833654d9ad37358712386836d98f771e06
|
2018-10-25 22:36:23 -07:00 |
|
Seigo Nonaka
|
958744661f
|
[automerger skipped] Merge "Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE"" am: 487ecbfc6c -s ours am: d5774f1325 -s ours
am: f5552a3bac -s ours
Change-Id: Ide17103285675381f62486d5978aa805f9514936
|
2018-10-25 22:10:45 -07:00 |
|
Hyunyoung Song
|
4f8f072f7c
|
Merge "Add launcher.proto to atoms.proto"
|
2018-10-26 04:57:58 +00:00 |
|
Android Build Merger (Role)
|
cd553d02ee
|
Merge "[automerger skipped] Merge "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE" am: 07ac5d600c -s ours am: 4c2b3ce443 -s ours am: b05347ca69 -s ours"
|
2018-10-26 04:56:55 +00:00 |
|
Seigo Nonaka
|
2e15539625
|
[automerger skipped] Merge "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE" am: 07ac5d600c -s ours am: 4c2b3ce443 -s ours
am: b05347ca69 -s ours
Change-Id: I548db5aa8570573260f3039598154e418cd2814f
|
2018-10-25 21:56:16 -07:00 |
|
Android Build Merger (Role)
|
62d9616cf0
|
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 5fb899d15b -s ours am: 4385f02221 -s ours"
|
2018-10-26 04:55:04 +00:00 |
|
Bill Yi
|
6907d55b14
|
[automerger skipped] Import translations. DO NOT MERGE am: 5fb899d15b -s ours
am: 4385f02221 -s ours
Change-Id: Ieb0d6919dd3ccd5af73bacf9fea07fb6995c8f2d
|
2018-10-25 21:54:32 -07:00 |
|
Android Build Merger (Role)
|
2c1ed7280d
|
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 20add0a4c6 -s ours am: ebccff42db -s ours am: 7845c968ce -s ours"
|
2018-10-26 04:54:27 +00:00 |
|
Bill Yi
|
3d80f4138e
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 20add0a4c6 -s ours am: ebccff42db -s ours
am: 7845c968ce -s ours
Change-Id: I50119db0237f47fb359e1963c712098c8ca8325b
|
2018-10-25 21:53:54 -07:00 |
|
Android Build Merger (Role)
|
fe051804b8
|
Merge "Merge "Add more debug log when onBlockedStatusChanged was called." am: 48f337457b am: 6023fd96b1 am: a4875dce41"
|
2018-10-26 04:53:49 +00:00 |
|
Junyu Lai
|
6ff4eb7a9d
|
Merge "Add more debug log when onBlockedStatusChanged was called." am: 48f337457b am: 6023fd96b1
am: a4875dce41
Change-Id: I286f5b57ca95234e916da6adb6ceedbd1584107e
|
2018-10-25 21:53:18 -07:00 |
|
Android Build Merger (Role)
|
9a3f63d713
|
Merge changes from topic "am-6269d6c0d0bb413c84e5068d06041457"
* changes:
Merge "Add keys to retrieve color aspects from metadata" am: 6636b0227d am: a2ec9e32c6 am: 194a3a7587
Merge "Color aspects keys information stored database" am: e4c918ba8e am: 89c615866a am: e8c39f3ba0
|
2018-10-26 04:47:08 +00:00 |
|
Chong Zhang
|
87e5a5e051
|
Merge "Add keys to retrieve color aspects from metadata" am: 6636b0227d am: a2ec9e32c6
am: 194a3a7587
Change-Id: Ic37c9fa91cc637ec2ab61ea10afa8e928442d16f
|
2018-10-25 21:46:21 -07:00 |
|
Chong Zhang
|
d31872bc6a
|
Merge "Color aspects keys information stored database" am: e4c918ba8e am: 89c615866a
am: e8c39f3ba0
Change-Id: I08c65f1b032fe92994202b64900cccc4f61adaef
|
2018-10-25 21:36:59 -07:00 |
|
Android Build Merger (Role)
|
cbe768575f
|
Merge "[automerger skipped] Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM." am: 6f7d3848c5 am: 6e4f0f3ee6 am: 12b9f89abf -s ours"
|
2018-10-26 04:30:38 +00:00 |
|
Xiangyu/Malcolm Chen
|
8dba49402d
|
[automerger skipped] Merge "Define RIL_REQUEST_SET_PREFERRED_DATA_MODEM." am: 6f7d3848c5 am: 6e4f0f3ee6
am: 12b9f89abf -s ours
Change-Id: If5e52ef7d7052ba40bfb8c7da0c11431846f3169
|
2018-10-25 21:29:00 -07:00 |
|
Android Build Merger (Role)
|
fa70c83199
|
Merge "Merge "Firewall-related commands porting" am: 1acfa7de1b am: 6ba18c6b03 am: b87796365e"
|
2018-10-26 04:22:34 +00:00 |
|
Luke Huang
|
1edf4c6397
|
Merge "Firewall-related commands porting" am: 1acfa7de1b am: 6ba18c6b03
am: b87796365e
Change-Id: I3a2d3115a9664fd2be458076d7a7092a7cb5293c
|
2018-10-25 21:21:01 -07:00 |
|
Android Build Merger (Role)
|
6f38ea1b3a
|
Merge "[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b634e9191 -s ours am: 904d4df89a -s ours am: 0103338bfb -s ours"
|
2018-10-26 04:14:45 +00:00 |
|
Bill Yi
|
4fda691287
|
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b634e9191 -s ours am: 904d4df89a -s ours
am: 0103338bfb -s ours
Change-Id: I75b649236c9bc42d627dd79d055e38b26e20fa40
|
2018-10-25 21:14:17 -07:00 |
|
Android Build Merger (Role)
|
38fa97128e
|
Merge "Merge "Remove obsolete @VisibleForTesting Annotation" am: 1e8249a1d6 am: 2c8ace0794 am: eeb74b5312"
|
2018-10-26 04:14:12 +00:00 |
|
Brad Ebinger
|
bb6a3f4aab
|
Merge "Remove obsolete @VisibleForTesting Annotation" am: 1e8249a1d6 am: 2c8ace0794
am: eeb74b5312
Change-Id: I4599bd202f51726db78c37213afd26a69c8ee31d
|
2018-10-25 21:13:51 -07:00 |
|
TreeHugger Robot
|
3fb3ac1ab2
|
Merge "Keep file path used to create SkTypeface in MinikinFontSkia"
|
2018-10-26 04:12:51 +00:00 |
|
Brad Ebinger
|
4b81463736
|
Merge "ImsSsData needs a public constructor for vendors to use" am: a1474266bf am: 207b9dcfbf
am: ee7267f8dd
Change-Id: Ia9ca9493a802b5e79ee7337ddb308b3dd4883114
|
2018-10-25 20:45:24 -07:00 |
|
Youming Ye
|
900c361a6d
|
Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"" am: 94fe6430ea am: 555090d597
am: e937fd1ad3
Change-Id: Ieb632cfa242bb0efd3584bb2fd47e596c900da16
|
2018-10-25 20:37:53 -07:00 |
|
Tony Zhu
|
065b19e137
|
Merge "[Call Screening]Support for carrier call screening app" am: ee31b2214d am: 3cde670dd3
am: 3403275a85
Change-Id: I6a9215503805b6aa42052e42ed0044b9d282ebb6
|
2018-10-25 20:30:56 -07:00 |
|
Bill Yi
|
4853dcbd97
|
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: 531348c917 -s ours
am: 2970e4846c -s ours
Change-Id: Ibe80ad8a60c74e954623c543607573491754cd2e
|
2018-10-25 20:12:57 -07:00 |
|
Chalard Jean
|
96d551145d
|
Merge "To support skip464xlat per Network" am: a01c77a499 am: e826aa52e4
am: fbb737678b
Change-Id: I4a6d7480e2e7e775e511cc7eaaabe65b6a3bde7d
|
2018-10-25 20:09:15 -07:00 |
|
Luke Huang
|
674f13ba10
|
Merge "Refine network-related commands porting" am: 82696f8e4c am: 3c78330edb
am: fbe95d1601
Change-Id: Iabd9c24ed2d948b02f0ddeef20571e4df292bc98
|
2018-10-25 20:01:38 -07:00 |
|
Chiachang Wang
|
e9a0d974de
|
Merge "Move captive portal detection to another thread" am: 9514b362cd am: bed0271888
am: 0f46209cf5
Change-Id: Ieef24e0184bb7623610164e9bd228846ec86452f
|
2018-10-25 19:55:04 -07:00 |
|
TreeHugger Robot
|
6c38f6a8c0
|
Merge "Import translations. DO NOT MERGE"
|
2018-10-26 02:44:52 +00:00 |
|
Hall Liu
|
0b9ebf1d44
|
Merge "Add test API to override carrier config" am: a82f952fe7 am: 657e2a925d
am: 19c6fd5ab1
Change-Id: Ie243b230d3f6d8aca5c292ee497d9e4dc060aec0
|
2018-10-25 19:39:19 -07:00 |
|
Nathan Harold
|
1be1fa0be0
|
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a884 am: 8dc36336d5
am: 7695b94e10
Change-Id: I2b6a3753b8aaf9e420f114e1c6acc227b38ba8a4
|
2018-10-25 19:32:53 -07:00 |
|
Jan Kowal
|
f4ae587aed
|
Merge "Fix for android.hardware.radio.Utils.createIntSet" am: b25190cf62 am: e01a3fd480
am: a5b038fb9e
Change-Id: If938c1028dac3a93d5152a370ef47df20b38052b
|
2018-10-25 19:26:22 -07:00 |
|
Nathan Harold
|
6bdfcd4462
|
Merge "Remove Hidden TimestampType From CellInfo" am: c65e610c06 am: 0cce6d2bf4
am: fce9aea69a
Change-Id: Ibfa6b78cdc5d0f1fc603e119278fbfb838ce62e8
|
2018-10-25 19:18:41 -07:00 |
|
Android Build Merger (Role)
|
94e0559935
|
Merge "[automerger skipped] Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed am: 13c9e7e2f3 am: 41e2d7494f -s ours"
|
2018-10-26 02:02:33 +00:00 |
|
Nathan Harold
|
864b86b3a2
|
[automerger skipped] Merge "Move some members to the "Q blacklist"." am: f5cf9f24ed am: 13c9e7e2f3
am: 41e2d7494f -s ours
Change-Id: I56c4b05166a7299da177e4a0f98a7aa2003d7dc6
|
2018-10-25 19:02:07 -07:00 |
|
Hugh Chen
|
04a4601a4b
|
Merge "Make HearingAid code more generic"
|
2018-10-26 01:57:24 +00:00 |
|
Android Build Merger (Role)
|
524dc7114d
|
Merge "Merge "Re-add removed APIs per API council feedback." am: a94a71af13 am: 7085118cfc am: db0e0f8c57"
|
2018-10-26 01:56:09 +00:00 |
|
Tyler Gunn
|
1af91e3de8
|
Merge "Re-add removed APIs per API council feedback." am: a94a71af13 am: 7085118cfc
am: db0e0f8c57
Change-Id: If4d0ac8815596756774445c558a9456968c4e990
|
2018-10-25 18:55:47 -07:00 |
|
Android Build Merger (Role)
|
88a07ff46d
|
Merge changes from topic "am-34d0daed14804ba28e3c704dabdb9fc0"
* changes:
Merge "Fix data source for HEIF exif extractor" am: 31bbb473ce am: e655bf6d4b am: 65a4a60827
Merge "Change caught exception in MediaScanner when ExifInterface is created" am: 0915931939 am: 544c774381 am: 92ccb271ce
|
2018-10-26 01:49:40 +00:00 |
|
Chong Zhang
|
17807ec5e7
|
Merge "Fix data source for HEIF exif extractor" am: 31bbb473ce am: e655bf6d4b
am: 65a4a60827
Change-Id: Ia379b2f9f712672bb5b94817962b5a6b1f1e4873
|
2018-10-25 18:48:54 -07:00 |
|
Toshikazu Saito
|
5dfd47aacd
|
Merge "Change caught exception in MediaScanner when ExifInterface is created" am: 0915931939 am: 544c774381
am: 92ccb271ce
Change-Id: If5c4f35573d0c73bf412b22406d04e70fba1f17c
|
2018-10-25 18:41:28 -07:00 |
|
Android Build Merger (Role)
|
d14733d791
|
Merge "[automerger skipped] Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" am: 0875fbab4b am: 4190b87df6 am: ecc6407263 -s ours"
|
2018-10-26 01:34:05 +00:00 |
|
Xiangyu/Malcolm Chen
|
53dc07009f
|
[automerger skipped] Merge "Add PhoneStateListener#onPreferredDataSubIdChanged" am: 0875fbab4b am: 4190b87df6
am: ecc6407263 -s ours
Change-Id: I0e331dd2fd9baa9248af45b8348fb4abbbd4e5e3
|
2018-10-25 18:33:28 -07:00 |
|
Android Build Merger (Role)
|
0a7788e772
|
Merge "[automerger skipped] Merge "Adds new Public ImsManager API" am: a993f6d76f am: e80316e494 -s ours am: 1396c08660 -s ours"
|
2018-10-26 01:25:50 +00:00 |
|
Brad Ebinger
|
94e202cd39
|
[automerger skipped] Merge "Adds new Public ImsManager API" am: a993f6d76f am: e80316e494 -s ours
am: 1396c08660 -s ours
Change-Id: I8a05b53f80bad19521d0d046c6f965b374fb54ea
|
2018-10-25 18:24:38 -07:00 |
|
Kevin Chyn
|
ed5b85e3b1
|
Merge "Surface IBiometricsFace#userActivity to FaceManager"
|
2018-10-26 01:20:19 +00:00 |
|
Kevin Chyn
|
c8f0754e44
|
Merge "Add face acquired constants"
|
2018-10-26 01:19:47 +00:00 |
|
Android Build Merger (Role)
|
ed0f12628d
|
Merge "Merge "Clarify createScaledBitmap's 'filter' docs" am: e0f6d84ba1 am: 324cb8c075 am: c2eaf48e42"
|
2018-10-26 01:17:57 +00:00 |
|