OSDN Git Service
Jakub Pawlowski [Thu, 8 Jun 2017 21:30:57 +0000 (21:30 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" am:
404e9f209f am:
c0fed83b84
am:
3b852973e3
Change-Id: I1c037d2461bb5c82ff405a507c9fce60b5902368
Adam Lesinski [Thu, 8 Jun 2017 21:25:24 +0000 (21:25 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev am:
887544e100
am:
adca091fcd
Change-Id: I49afd37a236925b59ac84fe4b620e2a93baf0686
Jakub Pawlowski [Thu, 8 Jun 2017 21:20:27 +0000 (21:20 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations" am:
404e9f209f
am:
c0fed83b84
Change-Id: I871bc30dcd7aeb5c4a6f6c15d84b43dee84994f2
Adam Lesinski [Thu, 8 Jun 2017 21:20:03 +0000 (21:20 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
am:
887544e100
Change-Id: I440be882264d8687d7b5e3de036e54bf91386d6d
Adam Lesinski [Thu, 8 Jun 2017 21:14:02 +0000 (21:14 +0000)]
Merge "Revert "always adjust per-user application info"" into oc-dev
Jakub Pawlowski [Thu, 8 Jun 2017 21:12:26 +0000 (21:12 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations"
am:
404e9f209f
Change-Id: I01699795f733fbf46af10ba25afd8cb3feecc9ea
Adam Lesinski [Thu, 8 Jun 2017 20:16:39 +0000 (20:16 +0000)]
Revert "always adjust per-user application info"
This reverts commit
e0046cecb079ec4d063444cee64795a6b734e6e7.
Reason for revert: Regresses UI theme
Bug:
62445682
Bug:
36561125
Change-Id: I9b60bd8e4eb89129368d38e83c0036ab459a524e
Jakub Pawlowski [Thu, 8 Jun 2017 20:59:33 +0000 (20:59 +0000)]
Merge "Bluetooth: fix connectGatt overload invocations"
Tyler Gunn [Thu, 8 Jun 2017 20:50:56 +0000 (20:50 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am:
980582e555
am:
da88ca6f10
Change-Id: Ie425e27ee5821f5117d9159b1b5180389f2faa1d
Tyler Gunn [Thu, 8 Jun 2017 20:41:57 +0000 (20:41 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am:
980582e555
am:
f512d86f5b
Change-Id: Ic863586ac031b340a30db6f408240f68b270ad76
Daichi Hirono [Thu, 8 Jun 2017 20:37:32 +0000 (20:37 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am:
ebb6e998d5
am:
87df9ee8b7
Change-Id: I714abae0311042314d670a6ba8fc14548fea52ce
Android Build Merger (Role) [Thu, 8 Jun 2017 20:33:28 +0000 (20:33 +0000)]
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
Android Build Merger (Role) [Thu, 8 Jun 2017 20:32:21 +0000 (20:32 +0000)]
Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am:
ebb6e998d5 am:
44442c4c99" into oc-dr1-dev-plus-aosp
Mady Mellor [Thu, 8 Jun 2017 20:32:22 +0000 (20:32 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am:
f574869c11
am:
440137be48
Change-Id: I8d6b0b9899119f7bbefc1e0048bbbe916fa9db28
Android Build Merger (Role) [Thu, 8 Jun 2017 20:31:48 +0000 (20:31 +0000)]
Merge "Merge "Fix crash when deleting task" into oc-dev am:
c6fa8ee018 am:
9fd8e49fe0" into oc-dr1-dev-plus-aosp
Daichi Hirono [Thu, 8 Jun 2017 20:31:17 +0000 (20:31 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am:
ebb6e998d5
am:
44442c4c99
Change-Id: I8e78cbf8718a7e0665a367cd90333f6dcaf6de55
Winson Chung [Thu, 8 Jun 2017 20:29:21 +0000 (20:29 +0000)]
Merge "Fix crash when deleting task" into oc-dev am:
c6fa8ee018
am:
9fd8e49fe0
Change-Id: Ia336b014df6e9a9445d17f9aa485d24b3f1ea921
Mady Mellor [Thu, 8 Jun 2017 20:28:26 +0000 (20:28 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am:
f574869c11
am:
b2b3628565
Change-Id: I7ba78968e6e5b6d07b0e36b83631535ad2209270
Tyler Gunn [Thu, 8 Jun 2017 20:26:55 +0000 (20:26 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am:
980582e555
Change-Id: Id41b469e278c194337da36a0b34d02efa99b8906
Android Build Merger (Role) [Thu, 8 Jun 2017 20:25:37 +0000 (20:25 +0000)]
Merge "Merge "Move QS cell indicator back into mobile data tile" into oc-dev am:
a5b457b3bf am:
0a993da2bf" into oc-dr1-dev-plus-aosp
Jason Monk [Thu, 8 Jun 2017 20:24:15 +0000 (20:24 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev am:
a5b457b3bf
am:
0a993da2bf
Change-Id: Idbfd4664ae7b45990771ab13763ae587798f1679
Winson Chung [Thu, 8 Jun 2017 20:23:29 +0000 (20:23 +0000)]
Merge "Fix crash when deleting task" into oc-dev am:
c6fa8ee018
am:
b2a93b69a2
Change-Id: Ic50927eed7d9f2a0a1a8e4c70118e3fbe633e081
Daichi Hirono [Thu, 8 Jun 2017 20:19:56 +0000 (20:19 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am:
ebb6e998d5
Change-Id: I03e1b4ddb5315a2eae099bb85b692bf90744ba3d
Mady Mellor [Thu, 8 Jun 2017 20:16:45 +0000 (20:16 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am:
f574869c11
Change-Id: I8b98780208ca4e89d249fc7ebd688b868b3fb9be
Tyler Gunn [Thu, 8 Jun 2017 20:15:58 +0000 (20:15 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
am:
980582e555
Change-Id: I50666f5d3c4e224221a07a170598a5ea25d5f5ef
Jason Monk [Thu, 8 Jun 2017 20:15:01 +0000 (20:15 +0000)]
resolve merge conflicts of
a5b457b3bf6f to oc-dr1-dev
am:
d7dab0f36f
Change-Id: Ie14a5e532c4d30ab8fb013cc4fd2a96ecd5def15
Winson Chung [Thu, 8 Jun 2017 20:10:36 +0000 (20:10 +0000)]
Merge "Fix crash when deleting task" into oc-dev
am:
c6fa8ee018
Change-Id: I65e242e2f3de857c508c9a7c768ef504121acb25
Tyler Gunn [Thu, 8 Jun 2017 20:06:52 +0000 (20:06 +0000)]
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
Daichi Hirono [Thu, 8 Jun 2017 18:30:15 +0000 (18:30 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
am:
ebb6e998d5
Change-Id: I8973b62b103f4f40275bc5681f54b5957385ecb1
TreeHugger Robot [Thu, 8 Jun 2017 18:25:24 +0000 (18:25 +0000)]
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
Jakub Pawlowski [Wed, 7 Jun 2017 20:45:33 +0000 (13:45 -0700)]
Bluetooth: fix connectGatt overload invocations
Test: sl4a GattOverBrEdrTest
Bug:
62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
Mady Mellor [Thu, 8 Jun 2017 17:46:14 +0000 (17:46 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
am:
f574869c11
Change-Id: I9794ac492099f5a359a25652a49e94ef933e4e0c
Winson Chung [Thu, 8 Jun 2017 17:43:12 +0000 (17:43 +0000)]
Merge "Fix crash when deleting task" into oc-dev
am:
c6fa8ee018
Change-Id: Icb2d14ee8f7d5646e248aa010bcf731b6f1ff60f
TreeHugger Robot [Thu, 8 Jun 2017 17:39:37 +0000 (17:39 +0000)]
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
Winson Chung [Thu, 8 Jun 2017 17:37:53 +0000 (17:37 +0000)]
Merge "Fix crash when deleting task" into oc-dev
Jason Monk [Thu, 8 Jun 2017 17:00:40 +0000 (13:00 -0400)]
resolve merge conflicts of
a5b457b3bf6f to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aa49bfdbd2c44684d0edb21b52520fea406e167
Jason Monk [Thu, 8 Jun 2017 16:41:05 +0000 (16:41 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
am:
a5b457b3bf
Change-Id: I09bcb45a8931b8fedae967b1d88ab594164a9dc7
Jason Monk [Thu, 8 Jun 2017 16:35:21 +0000 (16:35 +0000)]
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
Android Build Merger (Role) [Thu, 8 Jun 2017 16:21:01 +0000 (16:21 +0000)]
Merge "Merge "Ensure only test print services enabled - framework" into oc-dev am:
053fb9120e am:
50859b50a6" into oc-dr1-dev-plus-aosp
Svetoslav Ganov [Thu, 8 Jun 2017 16:19:02 +0000 (16:19 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev am:
053fb9120e
am:
50859b50a6
Change-Id: I90ab9c9d83901f2ddcf646635364664a8fb51a93
Svetoslav Ganov [Thu, 8 Jun 2017 16:14:34 +0000 (16:14 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev am:
053fb9120e
am:
62031b8937
Change-Id: Ic5de35a7a93432c0984759ee415828cee9501e13
Jesse Hall [Thu, 8 Jun 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am:
9cf8c281d2 am:
00c6c3be77
am:
72a6853b9e
Change-Id: I6c4a6759d492a3db4d3ca3cab76e57333efe1a33
Svetoslav Ganov [Thu, 8 Jun 2017 16:04:17 +0000 (16:04 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
am:
053fb9120e
Change-Id: I70220ead15eabfe58727ab5c3b0a9c92e8c508a8
Svetoslav Ganov [Thu, 8 Jun 2017 16:01:54 +0000 (16:01 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
am:
053fb9120e
Change-Id: I5f07488ba286cb3d01c75d96e1003edba845daf8
Jesse Hall [Thu, 8 Jun 2017 15:56:17 +0000 (15:56 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" am:
9cf8c281d2
am:
00c6c3be77
Change-Id: I15b4288df07fe2f1fb5d0b4f6404708c116149ff
TreeHugger Robot [Thu, 8 Jun 2017 15:55:05 +0000 (15:55 +0000)]
Merge "Ensure only test print services enabled - framework" into oc-dev
Jesse Hall [Thu, 8 Jun 2017 15:41:46 +0000 (15:41 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
am:
9cf8c281d2
Change-Id: I025787589009c11bd5477777105b2a5ab2c5f592
Jesse Hall [Thu, 8 Jun 2017 15:34:42 +0000 (15:34 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable"
Android Build Merger (Role) [Thu, 8 Jun 2017 14:56:33 +0000 (14:56 +0000)]
Merge "Merge "Fix unexpected DatePicker validation" into oc-dev am:
cd603221e1 am:
35d1ab4281" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 14:56:06 +0000 (14:56 +0000)]
Merge "Merge "Fix unexpected DatePicker validation" into oc-dev am:
cd603221e1 am:
9a06d4bc77" into oc-dr1-dev-plus-aosp
Andrei Stingaceanu [Thu, 8 Jun 2017 14:55:33 +0000 (14:55 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev am:
cd603221e1
am:
35d1ab4281
Change-Id: I2303d47c828d654eb0be87d2a1dbb3ca69636985
Android Build Merger (Role) [Thu, 8 Jun 2017 14:55:01 +0000 (14:55 +0000)]
Merge "Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am:
13059cc2ad am:
5e1f15a89d" into oc-dr1-dev-plus-aosp
Andrei Stingaceanu [Thu, 8 Jun 2017 14:54:55 +0000 (14:54 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev am:
cd603221e1
am:
9a06d4bc77
Change-Id: I52602b7bea349fd455eaff7591e4b3f4e153ce63
Wale Ogunwale [Thu, 8 Jun 2017 14:53:01 +0000 (14:53 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am:
13059cc2ad
am:
5e1f15a89d
Change-Id: Ifb7664c7ade59390d682d0bebb6055097e653342
Wale Ogunwale [Thu, 8 Jun 2017 14:52:26 +0000 (14:52 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev am:
13059cc2ad
am:
bc4f4e5be6
Change-Id: I9877ba7613b9a41cb2b48df2ab0ac49be460961d
Andrei Stingaceanu [Thu, 8 Jun 2017 14:44:55 +0000 (14:44 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
am:
cd603221e1
Change-Id: Id06c3a8d76954f40c99673db034342c9023cc408
Andrei Stingaceanu [Thu, 8 Jun 2017 14:44:20 +0000 (14:44 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
am:
cd603221e1
Change-Id: Iaa491c27aebc60be5fe16668dda7904e2b089f54
Wale Ogunwale [Thu, 8 Jun 2017 14:41:34 +0000 (14:41 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am:
13059cc2ad
Change-Id: I079d34636465188b0d2bd231c798c44343bbc3b5
Wale Ogunwale [Thu, 8 Jun 2017 14:41:31 +0000 (14:41 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
am:
13059cc2ad
Change-Id: Iccf433dd506f42ae07531fe9cd0fa239882d4cf2
TreeHugger Robot [Thu, 8 Jun 2017 14:36:07 +0000 (14:36 +0000)]
Merge "Fix unexpected DatePicker validation" into oc-dev
Wale Ogunwale [Thu, 8 Jun 2017 14:33:03 +0000 (14:33 +0000)]
Merge "Revert "Temporarily enable screen wakelock logging in WM"" into oc-dev
Android Build Merger (Role) [Thu, 8 Jun 2017 14:26:14 +0000 (14:26 +0000)]
Merge "Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am:
b18f65a168 am:
ef711976c8" into oc-dr1-dev-plus-aosp
Selim Cinek [Thu, 8 Jun 2017 14:23:29 +0000 (14:23 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am:
b18f65a168
am:
1c28e96bf0
Change-Id: I68ac5b61d9e943346a62ed72fffe5650ce9cd2dd
Selim Cinek [Thu, 8 Jun 2017 14:23:27 +0000 (14:23 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev am:
b18f65a168
am:
ef711976c8
Change-Id: I8cf63a193d9b4cbf1cf62b48f051849d4e7158af
Selim Cinek [Thu, 8 Jun 2017 14:15:33 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I53abb4f31f8dc660ba9b140475bbd121df524613
Selim Cinek [Thu, 8 Jun 2017 14:15:29 +0000 (14:15 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
am:
b18f65a168
Change-Id: I385374ede44f09bb729ec7df7be13dc62c19bb2a
Selim Cinek [Thu, 8 Jun 2017 14:07:14 +0000 (14:07 +0000)]
Merge "Fixed a bug where the navigation notification would flicker" into oc-dev
Android Build Merger (Role) [Thu, 8 Jun 2017 13:43:53 +0000 (13:43 +0000)]
Merge "Delete legacy "wifi interface name guessing" behaviour am:
9e22554068 am:
998e766acc" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 8 Jun 2017 13:40:56 +0000 (13:40 +0000)]
Delete legacy "wifi interface name guessing" behaviour am:
9e22554068
am:
998e766acc
Change-Id: I7c4f88c27fae3a5d3730822a4ed25fdb2afaeeac
Erik Kline [Thu, 8 Jun 2017 13:40:54 +0000 (13:40 +0000)]
Delete legacy "wifi interface name guessing" behaviour am:
9e22554068
am:
e7d7699381
Change-Id: Iddfd2e5f81b80f311896e8eb4019d7ebd7c1c1c0
Erik Kline [Thu, 8 Jun 2017 13:32:57 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: Iecb4498c004a45403213d6e4bd7b6f8725334646
Erik Kline [Thu, 8 Jun 2017 13:32:53 +0000 (13:32 +0000)]
Delete legacy "wifi interface name guessing" behaviour
am:
9e22554068
Change-Id: I25e3814f979dbe65055498c85b34411cf6d3c996
Erik Kline [Thu, 8 Jun 2017 12:28:58 +0000 (12:28 +0000)]
Merge "Move findPreferredUpstreamType into UNM" am:
32703994fe am:
8bc87070f9
am:
ad652cbcf3
Change-Id: Ifa1a34a1fb32149085421a63cb0f2586d2862d6b
Erik Kline [Thu, 8 Jun 2017 12:20:31 +0000 (12:20 +0000)]
Merge "Move findPreferredUpstreamType into UNM" am:
32703994fe
am:
8bc87070f9
Change-Id: Ia215e55b69b856f5511e5d4f852e39fa6c11462e
Erik Kline [Thu, 8 Jun 2017 12:11:59 +0000 (12:11 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
am:
32703994fe
Change-Id: I20e90906e72bc8bba9f0f535d54ba430f96191ff
Treehugger Robot [Thu, 8 Jun 2017 12:02:59 +0000 (12:02 +0000)]
Merge "Move findPreferredUpstreamType into UNM"
Erik Kline [Thu, 8 Jun 2017 08:48:48 +0000 (17:48 +0900)]
Delete legacy "wifi interface name guessing" behaviour
Now that Wi-Fi always passes us the AP interface name (and mode)
we no longer need to guess which interface on which we're supposed
to be starting IP serving (either tethering or local-only hotspot).
Test: as follows
- built
- flashed
- booted
- TetheringTest passes
Bug:
32163131
Bug:
62343300
Change-Id: I6019410ee5adff4929690d35ba09294765fcd6a4
Erik Kline [Mon, 5 Jun 2017 07:02:02 +0000 (16:02 +0900)]
Move findPreferredUpstreamType into UNM
This changes the way in which available networks are found. Previously
Tethering asked ConnectivityService for NetworkInfo and checked for
whether or not it was in state CONNECTED.
Here we use the fact that ConnectivityService will not call UNM's
callbacks' onAvailable() methods until the networks in question have
become connected.
Test: as follows
- built
- flashed
- booted
- runtest framework-net passed
Bug:
32163131
Change-Id: I97abe225fdd3accb38bd9168f545445b761a90d8
Android Build Merger (Role) [Thu, 8 Jun 2017 06:26:07 +0000 (06:26 +0000)]
Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918 am:
07d2221218" into oc-dr1-dev-plus-aosp
Felipe Leme [Thu, 8 Jun 2017 06:20:24 +0000 (06:20 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918
am:
07d2221218
Change-Id: If47f67c7bf291e44015c92708eca0ff00a2a14b8
Android Build Merger (Role) [Thu, 8 Jun 2017 06:19:59 +0000 (06:19 +0000)]
Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376 am:
53bdeb1a46" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 8 Jun 2017 06:19:27 +0000 (06:19 +0000)]
Merge "Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918 am:
4d579eacec" into oc-dr1-dev-plus-aosp
Mark Rathjen [Thu, 8 Jun 2017 06:19:10 +0000 (06:19 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376
am:
53bdeb1a46
Change-Id: If4ba8d279d1bafbcb606f703a0f7498954c73e62
Felipe Leme [Thu, 8 Jun 2017 06:18:37 +0000 (06:18 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev am:
9be8c96918
am:
4d579eacec
Change-Id: I5824d83e8a5043766aa062ff023d5ad82be28d28
Yuchen He [Thu, 8 Jun 2017 06:17:14 +0000 (06:17 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev am:
3671e9249b
am:
c592c63a2d
Change-Id: If1a4ac40d340b9bd59fda0924bbbc313dbe810c1
Android Build Merger (Role) [Thu, 8 Jun 2017 06:14:49 +0000 (06:14 +0000)]
Merge "Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376 am:
d88c71a6e2" into oc-dr1-dev-plus-aosp
Mark Rathjen [Thu, 8 Jun 2017 06:14:00 +0000 (06:14 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am:
3492ed4376
am:
d88c71a6e2
Change-Id: Ic6204047cd677b339ff3de0ba74e6b194086ea11
Android Build Merger (Role) [Thu, 8 Jun 2017 06:13:35 +0000 (06:13 +0000)]
Merge "Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev am:
3671e9249b am:
43f1ee3ac8" into oc-dr1-dev-plus-aosp
Yuchen He [Thu, 8 Jun 2017 06:12:35 +0000 (06:12 +0000)]
Merge "Fix AeModeAndLock test cases. Bug:
36103813" into oc-dev am:
3671e9249b
am:
43f1ee3ac8
Change-Id: Ic0fb208b3b556269c24c8a6e8a557edf8bd917d4
Android Build Merger (Role) [Thu, 8 Jun 2017 06:12:06 +0000 (06:12 +0000)]
Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4 am:
0fcadeaeb9" into oc-dr1-dev-plus-aosp
Adam Bookatz [Thu, 8 Jun 2017 06:09:46 +0000 (06:09 +0000)]
Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am:
6029bce3b4
am:
0fcadeaeb9
Change-Id: Ieb7b6cd5299bab7f10c84f78e8ae1472988cff60
Andreas Gampe [Thu, 8 Jun 2017 06:08:30 +0000 (06:08 +0000)]
Merge "Framework: Remove SamplingProfiler" am:
d2ecee2506 am:
3ea0309e39 -s ours
am:
76f6da62e6 -s ours
Change-Id: If989c3990ed4570ba0feb09a62ecf3e6359d9c0f
Felipe Leme [Thu, 8 Jun 2017 06:07:15 +0000 (06:07 +0000)]
Merge "Overall improvement on Autofill javadocs for autofillable APIs." into oc-dev
am:
9be8c96918
Change-Id: Ib165e14765a74e77fd41d15d979bf7f7ac0726ed
Android Build Merger (Role) [Thu, 8 Jun 2017 06:05:33 +0000 (06:05 +0000)]
Merge "Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96 am:
23e5a1ee65" into oc-dr1-dev-plus-aosp
Mark Rathjen [Thu, 8 Jun 2017 06:04:54 +0000 (06:04 +0000)]
Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev
am:
3492ed4376
Change-Id: I49015844829d55a903437a807b345688794002b5
Todd Kennedy [Thu, 8 Jun 2017 06:04:42 +0000 (06:04 +0000)]
Merge changes Iea24e5a1,If71385bc into oc-dev am:
3834421c96
am:
23e5a1ee65
Change-Id: If4f55496f91c671545796f774d7ed5031b97ef86
Android Build Merger (Role) [Thu, 8 Jun 2017 06:04:13 +0000 (06:04 +0000)]
Merge "Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509 am:
7c44479edf" into oc-dr1-dev-plus-aosp
Phil Weaver [Thu, 8 Jun 2017 06:03:29 +0000 (06:03 +0000)]
Merge "Confirm a11y shortcut service for correct user" into oc-dev am:
03a5b3a509
am:
7c44479edf
Change-Id: Ia25a60f70dd172a7c8dfe5c17e72bdf193b0d3f0
Android Build Merger (Role) [Thu, 8 Jun 2017 06:03:01 +0000 (06:03 +0000)]
Merge "Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978 am:
de066fd249" into oc-dr1-dev-plus-aosp
Todd Kennedy [Thu, 8 Jun 2017 06:02:07 +0000 (06:02 +0000)]
Merge "Passing callingUid to internal methods" into oc-dev am:
dacdf2e978
am:
de066fd249
Change-Id: Ic66a91417dabf23ee798f5f38696e6fe543e9803
OSDN Git Service
