Automerger Merge Worker
5348bde8db
Remove setting LOCAL_MULTILIB from AUDIOSERVER_MULTILIB am: a64e618cb8 am: 9d820fddbf
...
Change-Id: I4216403ddcd9237f95ab61bca283342aa2f3a8b3
2019-12-12 02:26:41 +00:00
Sasha Smundak
9d820fddbf
Remove setting LOCAL_MULTILIB from AUDIOSERVER_MULTILIB
...
am: a64e618cb8
Change-Id: Iaaec04b571194cf2076712a9276031ea7ffa6390
2019-12-11 18:02:06 -08:00
Sasha Smundak
a64e618cb8
Remove setting LOCAL_MULTILIB from AUDIOSERVER_MULTILIB
...
Bug: 121208203
Test: treehugger
Change-Id: I7b896f0127e8fb52eb26aee8ba171a12b3721f4f
2019-12-06 12:39:32 -08:00
Xin Li
e82d828d64
Merge Android10 QPR1 into AOSP master am: d0037efa8d
...
am: cef5d421c5
Change-Id: Ie3777849415a4783e413170f73574cd71fe82c37
2019-12-04 08:07:13 -08:00
Xin Li
cef5d421c5
Merge Android10 QPR1 into AOSP master
...
am: d0037efa8d
Change-Id: I62c979bb4bdc9414780047e6615018ccf59f7e25
2019-12-03 16:07:07 -08:00
Xin Li
d0037efa8d
Merge Android10 QPR1 into AOSP master
...
Bug: 145570283
Change-Id: Idb8dca875f22c2f5421bd70bcc79044d90e0f7df
2019-12-02 21:25:04 -08:00
Tianjie Xu
29af28099e
Import the soong namespace hardware/google/pixel am: 923ea6cb43
...
am: 4947b8dc10
Change-Id: I7142be2b3e25b1aba52f302764245c8f9bd1a3d1
2019-12-02 15:44:56 -08:00
Tianjie Xu
4947b8dc10
Import the soong namespace hardware/google/pixel
...
am: 923ea6cb43
Change-Id: I66505371a87a4ba9db65ad994f9b6cd9218f0778
2019-12-02 15:40:22 -08:00
Tianjie Xu
923ea6cb43
Import the soong namespace hardware/google/pixel
...
So we can use the libmisc_writer under pixel.
Bug: 131775112
Test: build
Change-Id: Iccb32eda3c2bd583413f83c1f899bba04135af22
2019-11-18 15:26:30 -08:00
Tianjie Xu
bac448e58e
Use more specific option to set dark mode am: fd8e984334
...
am: 018b2075cb
Change-Id: Ib9fd1e507c57c7fc55314d11ce580b2d1d77ec02
2019-11-13 14:38:21 -08:00
Tianjie Xu
018b2075cb
Use more specific option to set dark mode
...
am: fd8e984334
Change-Id: Iba4d841248d6039c0b8694349ff41f483f7b8898
2019-11-13 14:34:47 -08:00
Ian Kasprzak
afaa91578c
Update license location to qcom blobs.
...
Switch from VENDOR_BLOBS_NOTICE to VENDOR_BLOBS_LICENSE.
Bug: 125451157
Bug: 144190530
Test: Presubmit
Change-Id: I2f33ea106a5ce5b31e787625f03bbe8511707018
2019-11-13 05:34:40 +00:00
Tianjie Xu
fd8e984334
Use more specific option to set dark mode
...
We have switch misc_writer to use more specific flags to set the dark mode.
Modify the caller as well.
Bug: 131775112
Test: set dark mode, check device boots with dark mode
Change-Id: Icbf3377e514f79b9b4bcf5c5a2dff9b0c8324df5
2019-11-11 22:47:49 -08:00
Ian Kasprzak
402df5775a
Add VENDOR_BLOBS_NOTICE to BoardConfigPartial.
...
Bug: 125451157
Bug: 144190530
Test: Presubmit
Change-Id: I7e585cb9ce1ae61f618198ef1627530e3c6a91fb
(cherry picked from commit 082aa2d1f851f7f1b5a795a75bd481245f4051d5)
2019-11-11 22:46:01 +00:00
Bill Yi
69d65201b9
Add bootloader and radio images to the vendor blobs packages
...
BUG:143903156
Change-Id: I12650326505a8307699bf689585f1e7e601ac8b6
2019-11-04 15:40:54 -08:00
Xin Li
71e0468e2e
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: b590e7039e
Change-Id: Icc8278d05ae39ea5badc93abe7844052f275938b
2019-10-31 13:13:22 -07:00
Xin Li
b590e7039e
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: I302909a90a72617728184e014b9f580eccb45fb9
2019-10-30 11:47:12 -07:00
Xin Li
ded78b32cc
Skip QD1A.190821.011 in stage-aosp-master am: d0010076bc
...
am: b2b4ca4ba4
Change-Id: Ie37e7500c33705a0d633759591c523045555b597
2019-10-16 21:33:02 -07:00
Xin Li
b2b4ca4ba4
Skip QD1A.190821.011 in stage-aosp-master
...
am: d0010076bc
Change-Id: I428009c6d4064586bcfa2f8a07d9168ff27ababb
2019-10-16 21:15:18 -07:00
Xin Li
d0010076bc
Skip QD1A.190821.011 in stage-aosp-master
...
Bug: 141248619
Change-Id: I8942091ee811e0d4afef7038741619c37473fd8f
2019-10-16 15:19:14 -07:00
Xin Li
80711d0fb8
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 63d6022adb -s ours
...
am: f9766ddbbe -s ours
am skip reason: change_id I8ab306d25c9201383704fd8dc5e1f0d91c89576b with SHA1 48b1f0aba0 is in history
Change-Id: I4ff1508410d227661f5b6820502e2559bfc2f04b
2019-09-08 15:47:39 -07:00
Xin Li
f9766ddbbe
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: 63d6022adb -s ours
am skip reason: change_id I8ab306d25c9201383704fd8dc5e1f0d91c89576b with SHA1 48b1f0aba0 is in history
Change-Id: I61e9b76944566d009f89d791b13f8966b6a4c165
2019-09-08 15:05:13 -07:00
Xin Li
63d6022adb
Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
No content change.
Bug: 135460123
Change-Id: I059e28a04828583f55eb5c3f793dba788009dbfc
Merged-In: I8ab306d25c9201383704fd8dc5e1f0d91c89576b
2019-09-08 12:43:12 -07:00
Xin Li
26155cd220
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 48b1f0aba0 -s ours am: b2c23770f8
...
am: 80b310423f
Change-Id: I41f7482f8dab1da3d4213a096df1fc2a58f95d7a
2019-09-05 11:49:08 -07:00
Xin Li
80b310423f
[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: 48b1f0aba0 -s ours
...
am: b2c23770f8
Change-Id: I46575430cec3f60ac6ea0d52ed63934b84f3557e
2019-09-05 11:27:05 -07:00
Xin Li
b2c23770f8
[automerger skipped] DO NOT MERGE - Merge Android 10 into master
...
am: 48b1f0aba0 -s ours
am skip reason: subject contains skip directive
Change-Id: I8c85c1e51555ddc206e00b37e86f04a4dbfc80b4
2019-09-05 11:14:32 -07:00
Xin Li
48b1f0aba0
DO NOT MERGE - Merge Android 10 into master
...
Bug: 139893257
Change-Id: I8ab306d25c9201383704fd8dc5e1f0d91c89576b
2019-09-04 13:33:20 -07:00
George Chang
70ccc4916a
[automerger skipped] Update NFC RF configuration
...
am: a691d34aa7 -s ours
am skip reason: change_id I6ebadab68413733d2bea77c68b3d525b4fabb2c0 with SHA1 520f18f13a is in history
Change-Id: I1a35de2afbf9992157fbdb2db0379b6f67da9a4b
2019-09-02 00:10:48 -07:00
Bill Yi
3c4bfd0b28
Add ims.apk blob am: f01d814bad
...
am: 47b6b033a9
Change-Id: I2ef27c861ccc9e34182dabdc83cbb7099eba1a54
2019-08-27 17:48:16 -07:00
Bill Yi
47b6b033a9
Add ims.apk blob
...
am: f01d814bad
Change-Id: Ic617464d28d9e7408d91e89597b55db765427843
2019-08-27 17:32:29 -07:00
Bill Yi
f01d814bad
Add ims.apk blob
...
BUG:138143812
Change-Id: Idf5fba6060b75a34b31cd839148a8fca3280fe0c
2019-08-27 11:46:54 -07:00
Xin Li
bcf84b1294
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: bd6c813a4d -s ours am: f3b197e34c
...
am: 52bb1c3084
Change-Id: Ib56c062d78dd6d419fee4ad0aeaf16a33145a528
2019-08-14 14:07:30 -07:00
Xin Li
52bb1c3084
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: bd6c813a4d -s ours
...
am: f3b197e34c
Change-Id: I53b1e13e41465733d9b0d7f6c7428099271a6c5f
2019-08-14 13:42:40 -07:00
Xin Li
f3b197e34c
[automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
am: bd6c813a4d -s ours
am skip reason: subject contains skip directive
Change-Id: Ifcf7c7638f5fc9c4addcbf054d2f83fa04f298ba
2019-08-14 13:17:36 -07:00
Xin Li
bd6c813a4d
DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master
...
Bug: 134405016
Change-Id: I54a0091806b0b68644abbcc4f97f97cafaa08bd6
2019-08-14 11:35:09 -07:00
George Chang
a691d34aa7
Update NFC RF configuration
...
Improve reader mode stability
Bug: 116325240
Bug: 128677836
Test: Read/Write Nfc Tag
Merged-In: I6ebadab68413733d2bea77c68b3d525b4fabb2c0
Change-Id: I6ebadab68413733d2bea77c68b3d525b4fabb2c0
2019-07-29 03:31:07 +00:00
Xin Li
04bc14a23d
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 281b39d66c -s ours am: 5c0a49a109 -s ours
...
am: 516ae8606b
Change-Id: I1f0c3f6bea3fd976706403a4d8367663815f9cd6
2019-07-09 16:47:38 -07:00
Xin Li
516ae8606b
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master am: 281b39d66c -s ours
...
am: 5c0a49a109 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib259944d1416618fdb2262e77b57606711fdf609
2019-07-09 15:52:52 -07:00
Xin Li
5c0a49a109
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
am: 281b39d66c -s ours
am skip reason: subject contains skip directive
Change-Id: I8fc180267b085fed6f362c902e6d8ad0e541b222
2019-07-09 15:07:11 -07:00
Xin Li
281b39d66c
DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
...
Bug: 136196576
Change-Id: Ia8aea5133230c26c68b2978d26a3fb60cb4aa272
2019-07-09 11:23:48 -07:00
android-build-team Robot
d908050daa
Snap for 5622519 from ccf24aa1fc to pi-platform-release
...
Change-Id: Ie3f02a4d95d52f28027dec3f5ff9f6ef2e500eac
2019-07-08 23:30:37 +00:00
George Chang
59e5975752
Update NFC RF configuration am: 520f18f13a am: cc65911abb
...
am: c252212fb0
Change-Id: I17cca2644d525d4125e3051fd47b5d92d7b83a8f
2019-07-02 16:09:39 -07:00
George Chang
c252212fb0
Update NFC RF configuration am: 520f18f13a
...
am: cc65911abb
Change-Id: I66f1db05c1daef7df079021b7bc1269d38a3cd1d
2019-07-02 15:18:29 -07:00
Xin Li
80fabfcef8
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
am: 71d92e827b
Change-Id: Icc64b4214d30e2b2b0c99597816ad0b1d242cf94
2019-07-02 12:58:11 -07:00
George Chang
cc65911abb
Update NFC RF configuration
...
am: 520f18f13a
Change-Id: I61878a9ab1d2262850b88ad1b7d503ad3a104691
2019-07-02 10:18:06 -07:00
George Chang
520f18f13a
Update NFC RF configuration
...
Improve reader mode stability
Bug: 128677836
Test: Read/Write Nfc Tag
Change-Id: I6ebadab68413733d2bea77c68b3d525b4fabb2c0
2019-07-02 11:54:35 +08:00
Xin Li
71d92e827b
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
...
Bug: 134405016
Change-Id: I4cf198b11f6194235cb7e8432cb6b9fda0fb13cc
2019-07-01 20:59:10 +00:00
android-build-team Robot
2182d2fbc5
Snap for 5691653 from 11d344396b to qt-c2f2-release
...
Change-Id: I7e10432daeb79429f22e5c2f3ab697f5d6a8a874
2019-06-27 03:13:09 +00:00
Tao Bao
3500df35d5
Merge "Dark boot on dark theme." into qt-dev am: 20b3a8837f
...
am: 11d344396b
Change-Id: Ib605f0bd0bf00fc96985d69aa254e28d6670572b
2019-06-26 10:55:43 -07:00
Tao Bao
11d344396b
Merge "Dark boot on dark theme." into qt-dev
...
am: 20b3a8837f
Change-Id: I0c5285eba6153e064d9eea9059f3bfc207e9d3a3
2019-06-26 10:25:58 -07:00