Tyler Gunn
|
cc26dbbb46
|
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555
am: da88ca6f10
Change-Id: Ie425e27ee5821f5117d9159b1b5180389f2faa1d
|
2017-06-08 20:50:56 +00:00 |
|
Tyler Gunn
|
37300eb77e
|
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555
am: f512d86f5b
Change-Id: Ic863586ac031b340a30db6f408240f68b270ad76
|
2017-06-08 20:41:57 +00:00 |
|
Daichi Hirono
|
0f9be35ae4
|
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5
am: 87df9ee8b7
Change-Id: I714abae0311042314d670a6ba8fc14548fea52ce
|
2017-06-08 20:37:32 +00:00 |
|
Android Build Merger (Role)
|
b1ae22139a
|
Merge "Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11 am: 440137be48" into oc-dr1-dev-plus-aosp
|
2017-06-08 20:33:33 +00:00 |
|
Android Build Merger (Role)
|
ec999df45c
|
Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 44442c4c99" into oc-dr1-dev-plus-aosp
|
2017-06-08 20:32:33 +00:00 |
|
Mady Mellor
|
8a1131aea6
|
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11
am: 440137be48
Change-Id: I8d6b0b9899119f7bbefc1e0048bbbe916fa9db28
|
2017-06-08 20:32:22 +00:00 |
|
Android Build Merger (Role)
|
b13b4a385a
|
Merge "Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018 am: 9fd8e49fe0" into oc-dr1-dev-plus-aosp
|
2017-06-08 20:31:55 +00:00 |
|
Daichi Hirono
|
eba3dc72a6
|
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5
am: 44442c4c99
Change-Id: I8e78cbf8718a7e0665a367cd90333f6dcaf6de55
|
2017-06-08 20:31:17 +00:00 |
|
Winson Chung
|
a2abb62e20
|
Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018
am: 9fd8e49fe0
Change-Id: Ia336b014df6e9a9445d17f9aa485d24b3f1ea921
|
2017-06-08 20:29:21 +00:00 |
|
Mady Mellor
|
16fe3c84f4
|
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11
am: b2b3628565
Change-Id: I7ba78968e6e5b6d07b0e36b83631535ad2209270
|
2017-06-08 20:28:26 +00:00 |
|
Tyler Gunn
|
f512d86f5b
|
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am: 980582e555
Change-Id: Id41b469e278c194337da36a0b34d02efa99b8906
|
2017-06-08 20:26:55 +00:00 |
|
Android Build Merger (Role)
|
c7d48044f1
|
Merge "Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf am: 0a993da2bf" into oc-dr1-dev-plus-aosp
|
2017-06-08 20:25:42 +00:00 |
|
Jason Monk
|
c5a5acad16
|
Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf
am: 0a993da2bf
Change-Id: Idbfd4664ae7b45990771ab13763ae587798f1679
|
2017-06-08 20:24:15 +00:00 |
|
Winson Chung
|
c259b94c63
|
Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018
am: b2a93b69a2
Change-Id: Ic50927eed7d9f2a0a1a8e4c70118e3fbe633e081
|
2017-06-08 20:23:29 +00:00 |
|
Daichi Hirono
|
44442c4c99
|
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am: ebb6e998d5
Change-Id: I03e1b4ddb5315a2eae099bb85b692bf90744ba3d
|
2017-06-08 20:19:56 +00:00 |
|
Mady Mellor
|
b2b3628565
|
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am: f574869c11
Change-Id: I8b98780208ca4e89d249fc7ebd688b868b3fb9be
|
2017-06-08 20:16:45 +00:00 |
|
Tyler Gunn
|
da88ca6f10
|
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am: 980582e555
Change-Id: I50666f5d3c4e224221a07a170598a5ea25d5f5ef
|
2017-06-08 20:15:58 +00:00 |
|
Jason Monk
|
c0eddd3657
|
resolve merge conflicts of a5b457b3bf to oc-dr1-dev
am: d7dab0f36f
Change-Id: Ie14a5e532c4d30ab8fb013cc4fd2a96ecd5def15
|
2017-06-08 20:15:01 +00:00 |
|
Winson Chung
|
b2a93b69a2
|
Merge "Fix crash when deleting task" into oc-dev
am: c6fa8ee018
Change-Id: I65e242e2f3de857c508c9a7c768ef504121acb25
|
2017-06-08 20:10:36 +00:00 |
|
Tyler Gunn
|
980582e555
|
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
|
2017-06-08 20:06:59 +00:00 |
|
Daichi Hirono
|
87df9ee8b7
|
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am: ebb6e998d5
Change-Id: I8973b62b103f4f40275bc5681f54b5957385ecb1
|
2017-06-08 18:30:15 +00:00 |
|
TreeHugger Robot
|
ebb6e998d5
|
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
|
2017-06-08 18:25:29 +00:00 |
|
Mady Mellor
|
440137be48
|
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am: f574869c11
Change-Id: I9794ac492099f5a359a25652a49e94ef933e4e0c
|
2017-06-08 17:46:14 +00:00 |
|
Winson Chung
|
9fd8e49fe0
|
Merge "Fix crash when deleting task" into oc-dev
am: c6fa8ee018
Change-Id: Icb2d14ee8f7d5646e248aa010bcf731b6f1ff60f
|
2017-06-08 17:43:12 +00:00 |
|
TreeHugger Robot
|
f574869c11
|
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
|
2017-06-08 17:39:43 +00:00 |
|
Winson Chung
|
c6fa8ee018
|
Merge "Fix crash when deleting task" into oc-dev
|
2017-06-08 17:38:00 +00:00 |
|
Jason Monk
|
d7dab0f36f
|
resolve merge conflicts of a5b457b3bf to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aa49bfdbd2c44684d0edb21b52520fea406e167
|
2017-06-08 13:00:40 -04:00 |
|
Jason Monk
|
0a993da2bf
|
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
am: a5b457b3bf
Change-Id: I09bcb45a8931b8fedae967b1d88ab594164a9dc7
|
2017-06-08 16:41:05 +00:00 |
|
Jason Monk
|
a5b457b3bf
|
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
|
2017-06-08 16:35:26 +00:00 |
|
Android Build Merger (Role)
|
c7e5462a61
|
Merge "Merge "Ensure only test print services enabled - framework" into oc-dev am: 053fb9120e am: 50859b50a6" into oc-dr1-dev-plus-aosp
|
2017-06-08 16:21:12 +00:00 |
|
Svetoslav Ganov
|
72fc8a5f09
|
Merge "Ensure only test print services enabled - framework" into oc-dev am: 053fb9120e
am: 50859b50a6
Change-Id: I90ab9c9d83901f2ddcf646635364664a8fb51a93
|
2017-06-08 16:19:02 +00:00 |
|
Svetoslav Ganov
|
454b310090
|
Merge "Ensure only test print services enabled - framework" into oc-dev am: 053fb9120e
am: 62031b8937
Change-Id: Ic5de35a7a93432c0984759ee415828cee9501e13
|
2017-06-08 16:14:34 +00:00 |
|
Jesse Hall
|
203f7efb59
|
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am: 9cf8c281d2 am: 00c6c3be77
am: 72a6853b9e
Change-Id: I6c4a6759d492a3db4d3ca3cab76e57333efe1a33
|
2017-06-08 16:04:45 +00:00 |
|
Svetoslav Ganov
|
50859b50a6
|
Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e
Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8
|
2017-06-08 16:04:17 +00:00 |
|
Svetoslav Ganov
|
62031b8937
|
Merge "Ensure only test print services enabled - framework" into oc-dev
am: 053fb9120e
Change-Id: I5f07488ba286cb3d01c75d96e1003edba845daf8
|
2017-06-08 16:01:54 +00:00 |
|
Jesse Hall
|
72a6853b9e
|
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am: 9cf8c281d2
am: 00c6c3be77
Change-Id: I15b4288df07fe2f1fb5d0b4f6404708c116149ff
|
2017-06-08 15:56:17 +00:00 |
|
TreeHugger Robot
|
053fb9120e
|
Merge "Ensure only test print services enabled - framework" into oc-dev
|
2017-06-08 15:55:14 +00:00 |
|
Jesse Hall
|
00c6c3be77
|
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
am: 9cf8c281d2
Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592
|
2017-06-08 15:41:46 +00:00 |
|
Jesse Hall
|
9cf8c281d2
|
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
|
2017-06-08 15:34:44 +00:00 |
|
Android Build Merger (Role)
|
7547884008
|
Merge "Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1 am: 35d1ab4281" into oc-dr1-dev-plus-aosp
|
2017-06-08 14:56:45 +00:00 |
|
Android Build Merger (Role)
|
a001cfe4ec
|
Merge "Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1 am: 9a06d4bc77" into oc-dr1-dev-plus-aosp
|
2017-06-08 14:56:14 +00:00 |
|
Andrei Stingaceanu
|
e539813fad
|
Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1
am: 35d1ab4281
Change-Id: I2303d47c828d654eb0be87d2a1dbb3ca69636985
|
2017-06-08 14:55:33 +00:00 |
|
Android Build Merger (Role)
|
02def68a68
|
Merge "Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am: 13059cc2ad am: 5e1f15a89d" into oc-dr1-dev-plus-aosp
|
2017-06-08 14:55:10 +00:00 |
|
Andrei Stingaceanu
|
2a133b6194
|
Merge "Fix unexpected DatePicker validation" into oc-dev am: cd603221e1
am: 9a06d4bc77
Change-Id: I52602b7bea349fd455eaff7591e4b3f4e153ce63
|
2017-06-08 14:54:55 +00:00 |
|
Wale Ogunwale
|
30700e46f5
|
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am: 13059cc2ad
am: 5e1f15a89d
Change-Id: Ifb7664c7ade59390d682d0bebb6055097e653342
|
2017-06-08 14:53:01 +00:00 |
|
Wale Ogunwale
|
51c34f7ef3
|
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am: 13059cc2ad
am: bc4f4e5be6
Change-Id: I9877ba7613b9a41cb2b48df2ab0ac49be460961d
|
2017-06-08 14:52:26 +00:00 |
|
Andrei Stingaceanu
|
35d1ab4281
|
Merge "Fix unexpected DatePicker validation" into oc-dev
am: cd603221e1
Change-Id: Id06c3a8d76954f40c99673db034342c9023cc408
|
2017-06-08 14:44:55 +00:00 |
|
Andrei Stingaceanu
|
9a06d4bc77
|
Merge "Fix unexpected DatePicker validation" into oc-dev
am: cd603221e1
Change-Id: Iaa491c27aebc60be5fe16668dda7904e2b089f54
|
2017-06-08 14:44:20 +00:00 |
|
Wale Ogunwale
|
bc4f4e5be6
|
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am: 13059cc2ad
Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5
|
2017-06-08 14:41:34 +00:00 |
|
Wale Ogunwale
|
5e1f15a89d
|
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am: 13059cc2ad
Change-Id: Iccf433dd506f42ae07531fe9cd0fa239882d4cf2
|
2017-06-08 14:41:31 +00:00 |
|