OSDN Git Service
Android Build Merger (Role) [Mon, 12 Jun 2017 17:00:41 +0000 (17:00 +0000)]
Merge "Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8 am:
d066c0c6cb" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Mon, 12 Jun 2017 16:59:23 +0000 (16:59 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8
am:
d066c0c6cb
Change-Id: I435c71537d41f94d4e9af2e07a9f2a9258f2eab5
Dianne Hackborn [Mon, 12 Jun 2017 16:57:12 +0000 (16:57 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev am:
4eb76b2db8
am:
5b3d0066bf
Change-Id: If930e143df6621c1c68a74462d0b64e29e0ad2a9
Dianne Hackborn [Mon, 12 Jun 2017 16:49:08 +0000 (16:49 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
4eb76b2db8
Change-Id: I34f85b8e06b3eddfee1ea57e8dfcd3ef74e10ff3
Dianne Hackborn [Mon, 12 Jun 2017 16:47:19 +0000 (16:47 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
am:
4eb76b2db8
Change-Id: I3aa5bbccbc669499a8ab6b12f180a7f5841164c3
Chris Thornton [Mon, 12 Jun 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0 -s ours
am:
5375d9360f
Change-Id: Ib2dd5a0264733ab829c2976eef29a68056aacc2c
Dianne Hackborn [Mon, 12 Jun 2017 16:38:46 +0000 (16:38 +0000)]
Merge "Work on issue #
62390590: SecurityException in JobIntentService$..." into oc-dev
Chris Thornton [Mon, 12 Jun 2017 16:38:33 +0000 (16:38 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev am:
484fb951e0
am:
722550cc3c -s ours
Change-Id: Ia7ed4ded824000ecf111f4ec2886a50dea67fa76
Chris Thornton [Mon, 12 Jun 2017 16:37:03 +0000 (16:37 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am:
484fb951e0 -s ours
Change-Id: I97dc24bc38e194b508a1b485ec4d7e1f8b62285d
Chris Thornton [Mon, 12 Jun 2017 16:25:59 +0000 (16:25 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
am:
484fb951e0
Change-Id: Ice2c1b83135368f11884f4d8b2cfab138715e69a
Chris Thornton [Mon, 12 Jun 2017 15:54:24 +0000 (15:54 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dev
Evan Laird [Mon, 12 Jun 2017 15:49:52 +0000 (15:49 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev
am:
e1f9b3f195
Change-Id: Ie5974f71084b99c27decadd0522af2a8a46e304d
TreeHugger Robot [Mon, 12 Jun 2017 15:42:14 +0000 (15:42 +0000)]
Merge "Round the slashes of SlashDrawable" into oc-dr1-dev
Android Build Merger (Role) [Mon, 12 Jun 2017 12:39:40 +0000 (12:39 +0000)]
Merge "Change the multipath hint default to 0. am:
d1e7d3d73e am:
9620595965" into oc-dr1-dev-plus-aosp
Lorenzo Colitti [Mon, 12 Jun 2017 12:37:13 +0000 (12:37 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e
am:
9620595965
Change-Id: Icf1707e4a179bf8835ec9f7be031e9a74e638625
Lorenzo Colitti [Mon, 12 Jun 2017 12:37:07 +0000 (12:37 +0000)]
Change the multipath hint default to 0. am:
d1e7d3d73e
am:
896a0065a6
Change-Id: Ie6611ee7f9169a53132a6e664814bc579d70170d
Lorenzo Colitti [Mon, 12 Jun 2017 12:29:31 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am:
d1e7d3d73e
Change-Id: Iab590e33a1ae64701f0023970d53b23470533962
Lorenzo Colitti [Mon, 12 Jun 2017 12:29:30 +0000 (12:29 +0000)]
Change the multipath hint default to 0.
am:
d1e7d3d73e
Change-Id: I7fdd9eb04e3b92bd28218fc3a33a6157f84cdc2f
Lorenzo Colitti [Mon, 12 Jun 2017 10:01:34 +0000 (19:01 +0900)]
Change the multipath hint default to 0.
It was set to 3 (handover+reliability) during the development
cycle, but should not be set to a nonzero value on user devices
until the returned value takes into account the amount of
non-default network data usage.
Bug:
34630278
Test: marlin builds and boots
Test: ConnectivityServiceTest passes
Change-Id: I2b09a6e09c497886862cbaaaf3b283dedfbfa94c
Erik Kline [Mon, 12 Jun 2017 05:13:17 +0000 (05:13 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev
am:
cdb134c012 -s ours
Change-Id: I6715134fe1883dc2d4613b38478d60f0ad2c33fe
TreeHugger Robot [Mon, 12 Jun 2017 05:06:35 +0000 (05:06 +0000)]
Merge "Add additional mocking for Context innards" into oc-dr1-dev
Erik Kline [Mon, 12 Jun 2017 04:59:44 +0000 (04:59 +0000)]
Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev
am:
cacf1981ca -s ours
Change-Id: Ib6cf8e7b04b9e24b9929d23f7ad3d79f2cf6dcc6
TreeHugger Robot [Mon, 12 Jun 2017 04:53:19 +0000 (04:53 +0000)]
Merge "Convert IControlsTethering from interface into callback" into oc-dr1-dev
Chris Thornton [Sun, 11 Jun 2017 00:31:57 +0000 (17:31 -0700)]
Prevent ConcurrentModificationException in updateAllRecognitions
When invoking updateAllRecognitions, if a callback binder was determined
to have died, an internal function would go and remove it from
mModelDataMap. However, updateAllRecognitions was iterating over this
map, so it would then explode. By first making a copy of the model datas
before iterating over all of them, this problem is avoided.
(As part of trying to figure out what was happening, also updated all
the method names that implicitly assumed they had a lock, and double
checked that everything with a Locked suffix is actually locked)
Bug:
62487479
Test: Use the sound trigger test app to load and start two models, force
kill the app (so the dangling binders hang around), then enable power
save (which triggers the call to updateAllRecognitions)
Change-Id: I87b9dfc1b2af5e294050b146737916ccaad882c1
Chris Thornton [Sun, 11 Jun 2017 18:03:32 +0000 (18:03 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev
am:
1761985e42
Change-Id: Ifad48a57d045c8b8548d8ca9cc659a16a9a2d1bf
Chris Thornton [Sun, 11 Jun 2017 17:56:21 +0000 (17:56 +0000)]
Merge "Prevent ConcurrentModificationException in updateAllRecognitions" into oc-dr1-dev
Erik Kline [Wed, 7 Jun 2017 07:33:19 +0000 (16:33 +0900)]
Add additional mocking for Context innards
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- cherry-picked to master and verified there as well
Bug:
32163131
Bug:
32561414
Merged-In: I2695841bfc31280060754132e589af1ca95911da
Merged-In: I9a05f34035a15b233a44d517f2b2426481679974
Change-Id: I0b5b1b12d55547d08c332c7d274f19f0023a7b07
(cherry picked from commit
ec37275ec9702b56bf328031675906a5483b89d4)
Erik Kline [Tue, 6 Jun 2017 10:24:21 +0000 (19:24 +0900)]
Convert IControlsTethering from interface into callback
Additionally:
- add updateLinkProperties() method to new callback
- skeletally connect LinkProperties updates through
to OffloadController
TODOs liberally sprinkled through out.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Merged-In: I178130e65db4fef26d62ea7eaa9a52f7e8103432
Merged-In: I832d77747de7517513c22d36fff4a2fa2bb95154
Change-Id: I631d17b26be153534551a1615931fc98b598b953
(cherry picked from commit
ab6439b0f8dd0a67c81235a3fc4d9c149de3780d)
Chris Thornton [Sun, 11 Jun 2017 00:31:57 +0000 (17:31 -0700)]
Prevent ConcurrentModificationException in updateAllRecognitions
When invoking updateAllRecognitions, if a callback binder was determined
to have died, an internal function would go and remove it from
mModelDataMap. However, updateAllRecognitions was iterating over this
map, so it would then explode. By first making a copy of the model datas
before iterating over all of them, this problem is avoided.
(As part of trying to figure out what was happening, also updated all
the method names that implicitly assumed they had a lock, and double
checked that everything with a Locked suffix is actually locked)
Bug:
62487479
Test: Use the sound trigger test app to load and start two models, force
kill the app (so the dangling binders hang around), then enable power
save (which triggers the call to updateAllRecognitions)
Change-Id: I87b9dfc1b2af5e294050b146737916ccaad882c1
Android Build Merger (Role) [Sat, 10 Jun 2017 16:14:51 +0000 (16:14 +0000)]
Merge "Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0 am:
ba16911723" into oc-dr1-dev-plus-aosp
Wale Ogunwale [Sat, 10 Jun 2017 16:13:51 +0000 (16:13 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0
am:
ba16911723
Change-Id: I12ba7aeeba10410b2b9291d6b8627bee539ba4df
Wale Ogunwale [Sat, 10 Jun 2017 16:11:47 +0000 (16:11 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev am:
b32fecd6e0
am:
a96a9f7326
Change-Id: Ic605bd334932fd01a12f7a1776259d1900915307
Wale Ogunwale [Sat, 10 Jun 2017 16:07:56 +0000 (16:07 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
am:
b32fecd6e0
Change-Id: I599924b33fbb137ba03607308011a8a76b524c72
Wale Ogunwale [Sat, 10 Jun 2017 16:05:53 +0000 (16:05 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
am:
b32fecd6e0
Change-Id: Iede7911ea687b7890833ee967da010db6041fb49
Wale Ogunwale [Sat, 10 Jun 2017 15:58:07 +0000 (15:58 +0000)]
Merge "Added 'dumpsys activity lastanr'" into oc-dev
Bill Yi [Sat, 10 Jun 2017 15:21:17 +0000 (15:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
70a2b34938 -s ours
Change-Id: Ica458f82fe18edb4f2b74b11aded21b66f1096d3
TreeHugger Robot [Sat, 10 Jun 2017 15:16:36 +0000 (15:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Sat, 10 Jun 2017 07:36:17 +0000 (07:36 +0000)]
Merge "Update captive portal notif for Android TV am:
6ab655227a am:
49ffd6bae2" into oc-dr1-dev-plus-aosp
Rhiannon Malia [Sat, 10 Jun 2017 07:35:20 +0000 (07:35 +0000)]
Update captive portal notif for Android TV am:
6ab655227a
am:
49ffd6bae2
Change-Id: I288db2f6f74109da750b35406f802e11360babaa
Rhiannon Malia [Sat, 10 Jun 2017 07:32:47 +0000 (07:32 +0000)]
Update captive portal notif for Android TV am:
6ab655227a
am:
949545789b
Change-Id: I258a24b9069f5ded14c3cec53be3039086cbf0ba
Rhiannon Malia [Sat, 10 Jun 2017 07:26:51 +0000 (07:26 +0000)]
Update captive portal notif for Android TV
am:
6ab655227a
Change-Id: I60a67b0f22aa186e8b738b8a9ee002b2b5b04e42
Rhiannon Malia [Sat, 10 Jun 2017 07:26:46 +0000 (07:26 +0000)]
Update captive portal notif for Android TV
am:
6ab655227a
Change-Id: I2096324e76770fee698507c2681d9c2fd92165b9
Bill Yi [Sat, 10 Jun 2017 06:16:16 +0000 (06:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
dfe6e518a2 -s ours
Change-Id: I7fbd39eeaaba27b93ef40201096fcd09bd176700
Bill Yi [Sat, 10 Jun 2017 06:13:36 +0000 (06:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7c8b1e6832 -s ours
Change-Id: I8f92d3f9c8b15070a661cf0480268b7100ca33ec
TreeHugger Robot [Sat, 10 Jun 2017 06:06:21 +0000 (06:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Sat, 10 Jun 2017 06:05:23 +0000 (06:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
62bee2f5ff -s ours
Change-Id: I2c72358b3b45a3321d76d9af147d3f3c0b179846
TreeHugger Robot [Sat, 10 Jun 2017 06:03:05 +0000 (06:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Sat, 10 Jun 2017 06:00:04 +0000 (06:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Rhiannon Malia [Mon, 5 Jun 2017 22:02:55 +0000 (15:02 -0700)]
Update captive portal notif for Android TV
Test: Connect to captive portal, notification appears in side panel
BUG:
38453402
Change-Id: I39baf90897f2f3d67b8b03c31dd74fa1d39d39de
Winson Chung [Sat, 10 Jun 2017 05:07:05 +0000 (05:07 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am:
a304564081
am:
c596ef26c6
Change-Id: I3e7006c0fc54d7131a2a44c70a8b216bfc646b3c
Winson Chung [Sat, 10 Jun 2017 05:02:02 +0000 (05:02 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am:
a304564081
am:
489e22503e
Change-Id: Ia2448b59ad2e0afd8d265572c81d794055423b8b
Winson Chung [Sat, 10 Jun 2017 04:57:50 +0000 (04:57 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am:
a304564081
Change-Id: I035b2e3f957334a7ef125256d5a44d2e798e61eb
Winson Chung [Sat, 10 Jun 2017 04:56:09 +0000 (04:56 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am:
a304564081
Change-Id: I916e692fae56ed79a60d37b471b6e07457d2509d
Winson Chung [Sat, 10 Jun 2017 04:50:09 +0000 (04:50 +0000)]
Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
Bill Yi [Sat, 10 Jun 2017 01:14:37 +0000 (18:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9310dd36258cc026421953cbea84b51650c47a35
Auto-generated-cl: translation import
Bill Yi [Sat, 10 Jun 2017 00:56:14 +0000 (17:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b6c615bb62abbb74f14adb70b5e29d96d3aeaad
Auto-generated-cl: translation import
Android Build Merger (Role) [Sat, 10 Jun 2017 00:55:03 +0000 (00:55 +0000)]
Merge "Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am:
ffd8343ba8 am:
6a71949f6e" into oc-dr1-dev-plus-aosp
Ben Gruver [Sat, 10 Jun 2017 00:52:24 +0000 (00:52 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am:
ffd8343ba8
am:
5be97babd6
Change-Id: Ic49f4796cf1bf26036a7d0aa7c06b2d0823e15de
Ben Gruver [Sat, 10 Jun 2017 00:52:22 +0000 (00:52 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am:
ffd8343ba8
am:
6a71949f6e
Change-Id: I2bb0ba88e8daeecc82014388d1a0fba54cd7847f
Ben Gruver [Sat, 10 Jun 2017 00:45:04 +0000 (00:45 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am:
ffd8343ba8
Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b
Ben Gruver [Sat, 10 Jun 2017 00:45:02 +0000 (00:45 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am:
ffd8343ba8
Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9
Bill Yi [Sat, 10 Jun 2017 00:44:49 +0000 (17:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a17e54b671202d6e1393410e2c9cc90552e3c32
Auto-generated-cl: translation import
Ben Gruver [Sat, 10 Jun 2017 00:38:54 +0000 (00:38 +0000)]
Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
Bill Yi [Sat, 10 Jun 2017 00:37:30 +0000 (17:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia5c68401fedb31ebd81cffb9700833d9dd1f71a5
Auto-generated-cl: translation import
Robert Greenwalt [Sat, 10 Jun 2017 00:26:26 +0000 (00:26 +0000)]
Merge "Changed Locale in ServiceInfo to a list." am:
a1df5b25e6 am:
af04c43e3b
am:
40b0ef4579
Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d
Robert Greenwalt [Sat, 10 Jun 2017 00:17:22 +0000 (00:17 +0000)]
Merge "Changed Locale in ServiceInfo to a list." am:
a1df5b25e6
am:
af04c43e3b
Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42
Wale Ogunwale [Fri, 9 Jun 2017 22:20:29 +0000 (15:20 -0700)]
Added 'dumpsys activity lastanr'
Allows for dumping the activity state during the last anr. This will
also be included in collected bug reports.
Bug:
38121026
Test: Cause an anr to occur and run 'adb shell dumpsys activity lastanr'
Change-Id: I1e4200f9e5cc16bfab98e5af31fc599cdd54cd11
Robert Greenwalt [Sat, 10 Jun 2017 00:10:33 +0000 (00:10 +0000)]
Merge "Changed Locale in ServiceInfo to a list."
am:
a1df5b25e6
Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e
Robert Greenwalt [Sat, 10 Jun 2017 00:03:56 +0000 (00:03 +0000)]
Merge "Changed Locale in ServiceInfo to a list."
Android Build Merger (Role) [Fri, 9 Jun 2017 23:59:07 +0000 (23:59 +0000)]
Merge "Merge "Add target sdk check for behavior change." into oc-dev am:
e5e246ce5c am:
4e76728dea" into oc-dr1-dev-plus-aosp
George Mount [Fri, 9 Jun 2017 23:56:46 +0000 (23:56 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev am:
e5e246ce5c
am:
4e76728dea
Change-Id: Ia31e1eefe3771f5cc76b53112e01efdedfe55c58
George Mount [Fri, 9 Jun 2017 23:56:41 +0000 (23:56 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev am:
e5e246ce5c
am:
62a18e12a3
Change-Id: I0c164eb98dd7265cdc67f107c3500f62dde7536a
George Mount [Fri, 9 Jun 2017 23:51:06 +0000 (23:51 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
am:
e5e246ce5c
Change-Id: Ia06fe694f2afe55cd9560c2d6ae9112a6735cf93
Dianne Hackborn [Fri, 9 Jun 2017 23:06:01 +0000 (16:06 -0700)]
Work on issue #
62390590: SecurityException in JobIntentService$...
...JobServiceEngineImpl$WrapperWorkItem.complete
Add more useful information in the security exception message that
is shown -- the reason the last job that was running on the context
was stopped. This should tell you why when you are calling at that
point your job is no longer running.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: Ia7155248b4b4f032cbf8e8754c5437f658ed192c
George Mount [Fri, 9 Jun 2017 23:49:21 +0000 (23:49 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
am:
e5e246ce5c
Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792
George Mount [Fri, 9 Jun 2017 23:41:40 +0000 (23:41 +0000)]
Merge "Add target sdk check for behavior change." into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 23:39:37 +0000 (23:39 +0000)]
Merge "Merge "Fix thread booster" into oc-dev am:
4c1209e00e am:
c48a8176e8" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 9 Jun 2017 23:38:50 +0000 (23:38 +0000)]
Merge "Fix thread booster" into oc-dev am:
4c1209e00e
am:
c48a8176e8
Change-Id: I30b49d87ad875b6a0bc30177959a2197cfc5a0b8
Jorim Jaggi [Fri, 9 Jun 2017 23:37:22 +0000 (23:37 +0000)]
Merge "Fix thread booster" into oc-dev am:
4c1209e00e
am:
2bdff7d64e
Change-Id: I3dc39403e74581946f90f0d9b21e981694e752ab
Android Build Merger (Role) [Fri, 9 Jun 2017 23:34:08 +0000 (23:34 +0000)]
Merge "Merge "Removed test from presubmit." into oc-dev am:
4f30aa2be8 am:
ed268dc350" into oc-dr1-dev-plus-aosp
Jorim Jaggi [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]
Merge "Fix thread booster" into oc-dev
am:
4c1209e00e
Change-Id: I3ef8bce9cd703a630280595a47baebae12c28387
Lucas Dupin [Fri, 9 Jun 2017 23:33:16 +0000 (23:33 +0000)]
Merge "Removed test from presubmit." into oc-dev am:
4f30aa2be8
am:
ed268dc350
Change-Id: I202bed758385f4918452d78dfef42682521132df
Lucas Dupin [Fri, 9 Jun 2017 23:31:01 +0000 (23:31 +0000)]
Merge "Removed test from presubmit." into oc-dev am:
4f30aa2be8
am:
c9d11b7e83
Change-Id: I94a073c6151d19a40a5fea2db5871b6dc970de80
Jorim Jaggi [Fri, 9 Jun 2017 23:30:24 +0000 (23:30 +0000)]
Merge "Fix thread booster" into oc-dev
am:
4c1209e00e
Change-Id: Iea1b674cefc1d63eaeb77511904afcf4fdc7639e
Lucas Dupin [Fri, 9 Jun 2017 23:26:36 +0000 (23:26 +0000)]
Merge "Removed test from presubmit." into oc-dev
am:
4f30aa2be8
Change-Id: I3f73f3581fad4575f774f2c5ba870cc3308443a4
Jorim Jaggi [Fri, 9 Jun 2017 23:23:56 +0000 (23:23 +0000)]
Merge "Fix thread booster" into oc-dev
Lucas Dupin [Fri, 9 Jun 2017 23:23:20 +0000 (23:23 +0000)]
Merge "Removed test from presubmit." into oc-dev
am:
4f30aa2be8
Change-Id: I49a803f8ecadfab53a686c91c601aaead8a1c81f
Hugo Benichi [Fri, 9 Jun 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Instrument captive portal login activity" into oc-dr1-dev
am:
169f7bebce
Change-Id: I25f8400556ed82e32bbb7abd6e3fccd3df83cd5f
Hugo Benichi [Fri, 9 Jun 2017 23:17:22 +0000 (23:17 +0000)]
Merge "Instrument captive portal login activity" into oc-dr1-dev
TreeHugger Robot [Fri, 9 Jun 2017 23:17:13 +0000 (23:17 +0000)]
Merge "Removed test from presubmit." into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 23:16:26 +0000 (23:16 +0000)]
Merge "Merge "" into oc-dev am:
0aaae4ae78 am:
770a4f20cc" into oc-dr1-dev-plus-aosp
Daniel Sandler [Fri, 9 Jun 2017 23:13:58 +0000 (23:13 +0000)]
Merge "" into oc-dev am:
0aaae4ae78
am:
9bb81db15e
Change-Id: Ic0654fa608e873075938dd2b4ad5aaafd59cc2eb
Daniel Sandler [Fri, 9 Jun 2017 23:13:57 +0000 (23:13 +0000)]
Merge "" into oc-dev am:
0aaae4ae78
am:
770a4f20cc
Change-Id: Idc25cc03b6c6d9f2441b90487757dea1e795d48c
Daniel Sandler [Fri, 9 Jun 2017 23:05:29 +0000 (23:05 +0000)]
Merge "" into oc-dev
am:
0aaae4ae78
Change-Id: Ibeceac21612da6669d0a216729c2671170651480
Daniel Sandler [Fri, 9 Jun 2017 23:05:19 +0000 (23:05 +0000)]
Merge "" into oc-dev
am:
0aaae4ae78
Change-Id: Ic671cd9a8718509728f6058b8d8b695cefbdc0f3
Daniel Sandler [Fri, 9 Jun 2017 22:55:42 +0000 (22:55 +0000)]
Merge "🐙" into oc-dev
Android Build Merger (Role) [Fri, 9 Jun 2017 22:27:07 +0000 (22:27 +0000)]
Merge "Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408" into oc-dev-plus-aosp am:
c3f93e120c" into oc-dr1-dev-plus-aosp
Felipe Leme [Fri, 9 Jun 2017 22:26:02 +0000 (22:26 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408" into oc-dev-plus-aosp
am:
c3f93e120c
Change-Id: Iaaf0f43a5d395110633c261e2f73025a284821b7
Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:32 +0000 (22:25 +0000)]
Merge "Merge "Update documentation for streaming methods" am:
186a588d57 am:
01604ebfc1 am:
cfbb73bcde" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 9 Jun 2017 22:25:08 +0000 (22:25 +0000)]
Merge "Merge "Minor fix on autofill() javadoc." into oc-dev am:
211e760408 am:
d11e14b428" into oc-dr1-dev-plus-aosp