Commit Graph

326588 Commits

Author SHA1 Message Date
Rhiannon Malia
bc69059c8f Merge "Update captive portal notif for Android TV am: 6ab655227a am: 49ffd6bae2" into oc-dr1-dev-plus-aosp
am: 803b04f835

Change-Id: I460f2fa866fd9a88f75ab7ba5796e0b572b9e16e
2017-06-10 07:41:59 +00:00
Rhiannon Malia
e8b1503fdc Update captive portal notif for Android TV am: 6ab655227a am: 949545789b
am: cb4765f307

Change-Id: I8c4ef4faa9bb72747b50dfdfac3a40ac2482bc82
2017-06-10 07:39:47 +00:00
Android Build Merger (Role)
803b04f835 Merge "Update captive portal notif for Android TV am: 6ab655227a am: 49ffd6bae2" into oc-dr1-dev-plus-aosp 2017-06-10 07:36:23 +00:00
Rhiannon Malia
59a5eaba22 Update captive portal notif for Android TV am: 6ab655227a
am: 49ffd6bae2

Change-Id: I288db2f6f74109da750b35406f802e11360babaa
2017-06-10 07:35:20 +00:00
Rhiannon Malia
cb4765f307 Update captive portal notif for Android TV am: 6ab655227a
am: 949545789b

Change-Id: I258a24b9069f5ded14c3cec53be3039086cbf0ba
2017-06-10 07:32:47 +00:00
Rhiannon Malia
49ffd6bae2 Update captive portal notif for Android TV
am: 6ab655227a

Change-Id: I60a67b0f22aa186e8b738b8a9ee002b2b5b04e42
2017-06-10 07:26:51 +00:00
Rhiannon Malia
949545789b Update captive portal notif for Android TV
am: 6ab655227a

Change-Id: I2096324e76770fee698507c2681d9c2fd92165b9
2017-06-10 07:26:46 +00:00
Bill Yi
8ee4c3af49 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: dfe6e518a2 -s ours
am: 6528998efc  -s ours

Change-Id: I8f1c84471907d056ba190c9ff489030da11686f2
2017-06-10 06:23:55 +00:00
Bill Yi
173bb6c061 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7c8b1e6832 -s ours
am: 8314ad1f25  -s ours

Change-Id: Ic2b7e8ee6338c3ed5bf154a14f048cbb86784c61
2017-06-10 06:21:36 +00:00
Bill Yi
6528998efc Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: dfe6e518a2  -s ours

Change-Id: I7fbd39eeaaba27b93ef40201096fcd09bd176700
2017-06-10 06:16:16 +00:00
Bill Yi
8314ad1f25 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 7c8b1e6832  -s ours

Change-Id: I8f92d3f9c8b15070a661cf0480268b7100ca33ec
2017-06-10 06:13:36 +00:00
Bill Yi
c3b2fc0691 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 62bee2f5ff -s ours
am: ad38904231  -s ours

Change-Id: I59488902d845e12d630ede0462d30a9a933e2261
2017-06-10 06:10:35 +00:00
TreeHugger Robot
dfe6e518a2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 06:06:25 +00:00
Bill Yi
ad38904231 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 62bee2f5ff  -s ours

Change-Id: I2c72358b3b45a3321d76d9af147d3f3c0b179846
2017-06-10 06:05:23 +00:00
TreeHugger Robot
7c8b1e6832 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 06:03:09 +00:00
TreeHugger Robot
62bee2f5ff Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-06-10 06:00:11 +00:00
Rhiannon Malia
6ab655227a Update captive portal notif for Android TV
Test: Connect to captive portal, notification appears in side panel

BUG:38453402
Change-Id: I39baf90897f2f3d67b8b03c31dd74fa1d39d39de
2017-06-10 05:22:42 +00:00
Winson Chung
5571ac1689 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081 am: c596ef26c6
am: b855ee1528

Change-Id: I712aa1ccf80f25afd6457438bc8583b74f1117b2
2017-06-10 05:16:37 +00:00
Winson Chung
32cb6e83cf Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081 am: 489e22503e
am: 051b7ab809

Change-Id: I208e0606c0e35d205630ae2281891ef5a7052911
2017-06-10 05:11:33 +00:00
Winson Chung
b855ee1528 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081
am: c596ef26c6

Change-Id: I3e7006c0fc54d7131a2a44c70a8b216bfc646b3c
2017-06-10 05:07:05 +00:00
Winson Chung
051b7ab809 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev am: a304564081
am: 489e22503e

Change-Id: Ia2448b59ad2e0afd8d265572c81d794055423b8b
2017-06-10 05:02:02 +00:00
Winson Chung
c596ef26c6 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am: a304564081

Change-Id: I035b2e3f957334a7ef125256d5a44d2e798e61eb
2017-06-10 04:57:50 +00:00
Winson Chung
489e22503e Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev
am: a304564081

Change-Id: I916e692fae56ed79a60d37b471b6e07457d2509d
2017-06-10 04:56:09 +00:00
Winson Chung
a304564081 Merge "Preemptively create Bitmap from GraphicBuffer" into oc-dev 2017-06-10 04:50:16 +00:00
Bill Yi
115afb735c Import translations. DO NOT MERGE
Change-Id: I9310dd36258cc026421953cbea84b51650c47a35
Auto-generated-cl: translation import
2017-06-09 18:14:37 -07:00
Ben Gruver
71ab39af08 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
am: 6871735ad0

Change-Id: I4b45ccbef9792a3b4e1c2604106814905e99fb7d
2017-06-10 01:02:28 +00:00
Ben Gruver
cea5efdde8 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev am: ffd8343ba8 am: 5be97babd6
am: 6fc077a2b1

Change-Id: I350ace09460de3018d9aa6ff5d27fd82bd6cd390
2017-06-10 00:58:56 +00:00
Bill Yi
dc62d84ffa Import translations. DO NOT MERGE
Change-Id: I1b6c615bb62abbb74f14adb70b5e29d96d3aeaad
Auto-generated-cl: translation import
2017-06-09 17:56:14 -07:00
Android Build Merger (Role)
6871735ad0 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 2017-06-10 00:55:10 +00:00
Ben Gruver
6fc077a2b1 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
2017-06-10 00:52:24 +00:00
Ben Gruver
c1d9d133bf 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
2017-06-10 00:52:22 +00:00
Ben Gruver
6a71949f6e Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am: ffd8343ba8

Change-Id: Ia3b7fe1bad2f3c2d13ce58f97174511ed8434e0b
2017-06-10 00:45:04 +00:00
Ben Gruver
5be97babd6 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev
am: ffd8343ba8

Change-Id: I5ac1fce3ab71415061ba152d9e34c96f9a53e1c9
2017-06-10 00:45:02 +00:00
Bill Yi
bb39a82705 Import translations. DO NOT MERGE
Change-Id: I8a17e54b671202d6e1393410e2c9cc90552e3c32
Auto-generated-cl: translation import
2017-06-09 17:44:49 -07:00
Ben Gruver
ffd8343ba8 Merge "Don't reset the value of package_verifier_enable if not in demo mode" into oc-dev 2017-06-10 00:39:02 +00:00
Robert Greenwalt
be9a2e4a0a Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b am: 40b0ef4579
am: 52bde254ba

Change-Id: I64363f953a2877159a14ca90463df91c7ea3d1fc
2017-06-10 00:34:33 +00:00
Robert Greenwalt
52bde254ba Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6 am: af04c43e3b
am: 40b0ef4579

Change-Id: I6b40f88b1793b157ec3babcb39caf5d916c6301d
2017-06-10 00:26:26 +00:00
Robert Greenwalt
40b0ef4579 Merge "Changed Locale in ServiceInfo to a list." am: a1df5b25e6
am: af04c43e3b

Change-Id: I5fb2897cb5456f92ea4da17d333f091f2f2c1e42
2017-06-10 00:17:22 +00:00
Robert Greenwalt
af04c43e3b Merge "Changed Locale in ServiceInfo to a list."
am: a1df5b25e6

Change-Id: I7477fa88ae9cc83605d2172294bf2ecbcafc567e
2017-06-10 00:10:33 +00:00
George Mount
984bc9cb52 Merge "Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 4e76728dea" into oc-dr1-dev-plus-aosp
am: 5f40d83476

Change-Id: I3ef0603edd519f31224eca164371758d74948787
2017-06-10 00:08:15 +00:00
George Mount
76922bbb97 Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 62a18e12a3
am: 3e9429be6a

Change-Id: Ia5d655f3ce6bb760574bd5abd02115d9284ea395
2017-06-10 00:04:26 +00:00
Robert Greenwalt
a1df5b25e6 Merge "Changed Locale in ServiceInfo to a list." 2017-06-10 00:03:58 +00:00
Android Build Merger (Role)
5f40d83476 Merge "Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 4e76728dea" into oc-dr1-dev-plus-aosp 2017-06-09 23:59:14 +00:00
George Mount
d2cfff5781 Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 4e76728dea

Change-Id: Ia31e1eefe3771f5cc76b53112e01efdedfe55c58
2017-06-09 23:56:46 +00:00
George Mount
3e9429be6a Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c
am: 62a18e12a3

Change-Id: I0c164eb98dd7265cdc67f107c3500f62dde7536a
2017-06-09 23:56:41 +00:00
Jorim Jaggi
769a55f4b3 Merge "Merge "Fix thread booster" into oc-dev am: 4c1209e00e am: c48a8176e8" into oc-dr1-dev-plus-aosp
am: dc708c88c1

Change-Id: Ic05bd027855f0c955fc059f9a9d06db79f3721bf
2017-06-09 23:53:04 +00:00
George Mount
4e76728dea Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: Ia06fe694f2afe55cd9560c2d6ae9112a6735cf93
2017-06-09 23:51:06 +00:00
George Mount
62a18e12a3 Merge "Add target sdk check for behavior change." into oc-dev
am: e5e246ce5c

Change-Id: I3734ee5cd46536a015a8fc60bf8b57818800c792
2017-06-09 23:49:21 +00:00
Jorim Jaggi
0cf055dc1b Merge "Fix thread booster" into oc-dev am: 4c1209e00e am: 2bdff7d64e
am: 3ee99d75dd

Change-Id: Iff38c8efc74c821ed473f50850720e6313244296
2017-06-09 23:49:14 +00:00
Lucas Dupin
495b9e8ff8 Merge "Merge "Removed test from presubmit." into oc-dev am: 4f30aa2be8 am: ed268dc350" into oc-dr1-dev-plus-aosp
am: ac48ff1b2e

Change-Id: Ibacb6e0ed479e61106a263575a336413c84670f5
2017-06-09 23:44:26 +00:00