Stan Iliev
f50806afb8
Merge SkiaCanvas changes from master-skia to master branch.
...
Most changes are taken from ag/1407698, ag/1336660, ag/1488900.
Test: Built and run manually on angler-eng.
Change-Id: Id4e464b9a83c62b6bc7ea31a30e5ca6cd53b659d
2016-10-24 12:16:13 -04:00
Hugo Benichi
58a7220b89
Merge "TokenBucket for rate-limiting and throttling"
2016-10-24 04:48:37 +00:00
Pankaj Kanwar
2f85495003
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am: 9cac4568e5 am: 0d75ccf006
...
am: 7332192158
2016-10-24 02:26:54 +00:00
Lorenzo Colitti
d2b90fb119
CaptivePortalLogin: set mixed content policy to compatibility. am: 625166377b am: c9f79b3d1e
...
am: b9dc4cf958
2016-10-24 02:25:50 +00:00
Pankaj Kanwar
7332192158
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev am: 9cac4568e5
...
am: 0d75ccf006
2016-10-24 02:20:20 +00:00
Lorenzo Colitti
b9dc4cf958
CaptivePortalLogin: set mixed content policy to compatibility. am: 625166377b
...
am: c9f79b3d1e
2016-10-24 02:19:19 +00:00
Pankaj Kanwar
0d75ccf006
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
...
am: 9cac4568e5
2016-10-24 02:13:18 +00:00
Lorenzo Colitti
c9f79b3d1e
CaptivePortalLogin: set mixed content policy to compatibility.
...
am: 625166377b
2016-10-24 02:13:15 +00:00
Pankaj Kanwar
9cac4568e5
Merge "CaptivePortalLogin: set mixed content policy to compatibility." into nyc-mr1-dev
2016-10-24 02:02:51 +00:00
Bill Yi
9e1782e2ac
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 496d17f748 -s ours am: 0f106f5744 -s ours
...
am: 28a2a4fe44
2016-10-22 12:03:13 +00:00
Bill Yi
45276a60d9
Import translations. DO NOT MERGE am: 300ad2e4b0 -s ours am: adfb58ac37 -s ours
...
am: 5171c42190
2016-10-22 12:02:17 +00:00
Bill Yi
61c084e710
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d849122bbb -s ours am: e7bdd3679c -s ours
...
am: 492069d446
2016-10-22 11:58:52 +00:00
Bill Yi
5401ba0cdd
Import translations. DO NOT MERGE am: 39eb3b4ac2 -s ours am: 28fbde286d -s ours
...
am: 2ba167ff2b
2016-10-22 11:58:01 +00:00
Bill Yi
f94ccb3b93
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: be30f0d5ea -s ours
...
am: 3501a750e5
2016-10-22 11:57:07 +00:00
Bill Yi
1287266bfe
Import translations. DO NOT MERGE am: 8758da732f -s ours
...
am: d5deaa138e
2016-10-22 11:56:11 +00:00
Bill Yi
28a2a4fe44
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 496d17f748 -s ours
...
am: 0f106f5744
2016-10-22 11:55:18 +00:00
Bill Yi
28bfe648ff
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 0cb41b80af -s ours
...
am: 51650365a4
2016-10-22 11:55:12 +00:00
Bill Yi
5171c42190
Import translations. DO NOT MERGE am: 300ad2e4b0 -s ours
...
am: adfb58ac37
2016-10-22 11:54:15 +00:00
Bill Yi
4903a6f932
Import translations. DO NOT MERGE am: c27fdce39f -s ours
...
am: 0e033e38cc
2016-10-22 11:54:14 +00:00
Bill Yi
492069d446
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d849122bbb -s ours
...
am: e7bdd3679c
2016-10-22 11:49:18 +00:00
Bill Yi
2ba167ff2b
Import translations. DO NOT MERGE am: 39eb3b4ac2 -s ours
...
am: 28fbde286d
2016-10-22 11:48:17 +00:00
Bill Yi
3501a750e5
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: be30f0d5ea
2016-10-22 11:47:00 +00:00
Bill Yi
d5deaa138e
Import translations. DO NOT MERGE
...
am: 8758da732f
2016-10-22 11:46:56 +00:00
Bill Yi
51650365a4
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 0cb41b80af
2016-10-22 11:45:36 +00:00
Bill Yi
0e033e38cc
Import translations. DO NOT MERGE
...
am: c27fdce39f
2016-10-22 11:45:32 +00:00
Bill Yi
0f106f5744
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 496d17f748
2016-10-22 11:42:09 +00:00
Bill Yi
adfb58ac37
Import translations. DO NOT MERGE
...
am: 300ad2e4b0
2016-10-22 11:42:07 +00:00
Bill Yi
e7bdd3679c
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: d849122bbb
2016-10-22 11:40:52 +00:00
Bill Yi
28fbde286d
Import translations. DO NOT MERGE
...
am: 39eb3b4ac2
2016-10-22 11:40:50 +00:00
TreeHugger Robot
be30f0d5ea
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-22 11:36:44 +00:00
TreeHugger Robot
0cb41b80af
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-22 11:35:36 +00:00
TreeHugger Robot
aa707f2547
Merge "Import translations. DO NOT MERGE"
2016-10-22 11:34:17 +00:00
TreeHugger Robot
a1be134b24
Merge "Import translations. DO NOT MERGE"
2016-10-22 11:33:40 +00:00
TreeHugger Robot
496d17f748
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-22 11:33:16 +00:00
TreeHugger Robot
d849122bbb
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-22 11:32:52 +00:00
Paulo Casanova
418063c63f
Merge "Added JNI interface for aapt2."
2016-10-22 08:19:19 +00:00
Bill Yi
39eb3b4ac2
Import translations. DO NOT MERGE
...
Change-Id: Ia238fb87c9c8be76cbadfbec1956b629414a3c48
Auto-generated-cl: translation import
2016-10-22 01:11:45 -07:00
Bill Yi
300ad2e4b0
Import translations. DO NOT MERGE
...
Change-Id: I3d5eae9008ead575fda0db5acbd233b4a9cf7273
Auto-generated-cl: translation import
2016-10-22 00:52:51 -07:00
Bill Yi
e486a8f4b6
Import translations. DO NOT MERGE
...
Change-Id: Iea19370bd97ac3bfaf398bd773b8f706461a6921
Auto-generated-cl: translation import
2016-10-22 00:39:33 -07:00
Bill Yi
5b3efeebc1
Import translations. DO NOT MERGE
...
Change-Id: Iea8977a449dd44d2bdbc0481a421606d5dfc3047
Auto-generated-cl: translation import
2016-10-21 23:40:55 -07:00
TreeHugger Robot
ff356a5661
Merge "Add one more CategoryKey."
2016-10-22 06:28:46 +00:00
Julius D'souza
2155de983f
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev am: e2590cccfd
...
am: 8c288cd77b
2016-10-22 04:17:28 +00:00
Julius D'souza
39fdb8369c
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples am: a2b07dc8d9
...
am: df09aa2135
2016-10-22 04:14:22 +00:00
Julius D'souza
451e742f06
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev am: e88cbbf40d
...
am: af9361f565
2016-10-22 04:13:23 +00:00
Julius D'souza
da6ace3a72
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze" am: 4fff94f1ed
...
am: 5f55007bc2
2016-10-22 04:12:20 +00:00
Julius D'souza
8c288cd77b
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
...
am: e2590cccfd
2016-10-22 04:05:59 +00:00
Julius D'souza
df09aa2135
DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples
...
am: a2b07dc8d9
2016-10-22 04:05:52 +00:00
Julius D'souza
af9361f565
Merge "Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"" into cw-f-dev
...
am: e88cbbf40d
2016-10-22 04:04:28 +00:00
Julius D'souza
5f55007bc2
Revert "DO NOT MERGE: Disable dim brightness reset when using ALS-based doze"
...
am: 4fff94f1ed
2016-10-22 04:04:22 +00:00
Julius D'souza
e2590cccfd
Merge "DO NOT MERGE: Cap doze autobrightness when collecting new sensor samples" into cw-f-dev
2016-10-22 03:58:28 +00:00
