Bill Yi
|
6793fac034
|
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a am: 4d58eb3bc1 am: e388855c62
am: 188e6e3470
Change-Id: I891f5ed900c38ac813051e14855abae8b429e9cc
|
2018-05-17 20:26:07 -07:00 |
|
Bill Yi
|
e408200ec2
|
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 am: f028e75015 -s ours am: c22431c753 -s ours am: 4ec0ca5336 -s ours
am: b566338b2d -s ours
Change-Id: I7099a46131bb1808fdf86243998c7b1c6bb5baa7
|
2018-05-17 20:19:41 -07:00 |
|
Bill Yi
|
d838378919
|
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am: c844ea5c96 am: 44042a74c7 am: 5ed1b8864a
am: 32e6e4174b
Change-Id: Iec70b38a112ba556d9b29f763fb65e45b2cacfae
|
2018-05-17 20:13:50 -07:00 |
|
Bill Yi
|
2cc8a319eb
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423 am: f3df46779d -s ours am: 2fe6455d18 -s ours am: 1531155e0d -s ours
am: c8edeae913 -s ours
Change-Id: I16bd528bccbee1326896cd3c62ed68509bf319e3
|
2018-05-17 20:07:45 -07:00 |
|
Bill Yi
|
3d337786e1
|
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5 am: 7c05674594 am: 08f437f2b4
am: fe4a877ae7
Change-Id: I5d341c12efa6fda2491b82d132ad74bf418a0d43
|
2018-05-17 20:03:46 -07:00 |
|
Bill Yi
|
d02a6897cf
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours am: a1df530ac7 -s ours am: 407d517cb8 -s ours
am: 35fdd1e3d1 -s ours
Change-Id: I74a3d11203f4c3c1b5ea6823e9ce3c90924822e2
|
2018-05-17 19:57:29 -07:00 |
|
Bill Yi
|
3f8654fc5d
|
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa am: aaddf187e4 am: 1803fec75f
am: d620aa5fd0
Change-Id: I575b80d162d67e8c85a1d4d6125830aae59201e3
|
2018-05-17 19:55:18 -07:00 |
|
Bill Yi
|
532835e9c2
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours am: eef34578b3 -s ours am: ede8c555e0 -s ours
am: 3befcfc215 -s ours
Change-Id: I7f8d60e6835189efb757a342a1d2b9dd3ad1ce1b
|
2018-05-17 19:48:55 -07:00 |
|
Bill Yi
|
a005a51e35
|
Merge changes from topic "am-d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev
am: 8e9cab7943
Change-Id: Iebab6ab25a97d27670b5044acbed0d5990be5d20
|
2018-05-17 19:43:56 -07:00 |
|
Bill Yi
|
a80ecc3d36
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours am: aa961b929b -s ours am: 1190c6d633 -s ours
am: c2a90162af -s ours
Change-Id: Ie06b0f73f6d5c2ea53374d3552f6e9506b2d79d6
|
2018-05-17 19:26:20 -07:00 |
|
Bill Yi
|
188e6e3470
|
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a am: 4d58eb3bc1
am: e388855c62
Change-Id: Ifc6bb00979b4390f099b9c169843a47f94a21235
|
2018-05-17 19:15:22 -07:00 |
|
Bill Yi
|
b566338b2d
|
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 am: f028e75015 -s ours am: c22431c753 -s ours
am: 4ec0ca5336 -s ours
Change-Id: I6c275134419ff0a7e8e9d0fec9e7056492416913
|
2018-05-17 19:10:00 -07:00 |
|
Bill Yi
|
32e6e4174b
|
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am: c844ea5c96 am: 44042a74c7
am: 5ed1b8864a
Change-Id: Ie3f95b39dfb049f2bdd098866821f3fe5f5fd186
|
2018-05-17 18:56:46 -07:00 |
|
Lucas Dupin
|
2bd8b6e4f2
|
Merge "Do not allow bouncer translation when scrimmed" into pi-dev
am: 0a72c6b08d
Change-Id: Ie566271b08b196be697f13f5f38d263d78fa3bbd
|
2018-05-17 18:53:18 -07:00 |
|
Bill Yi
|
c8edeae913
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423 am: f3df46779d -s ours am: 2fe6455d18 -s ours
am: 1531155e0d -s ours
Change-Id: I9a3f23a981837deaa6d26c4acfc11f0c19b9d32e
|
2018-05-17 18:49:54 -07:00 |
|
Lucas Dupin
|
a54d7db28f
|
Merge "Fix issue where guts would require bouncer" into pi-dev
am: a42d8f6e89
Change-Id: I31cba04ac9e513f83a1ed8def893fd086c17ff26
|
2018-05-17 18:44:15 -07:00 |
|
Bill Yi
|
fe4a877ae7
|
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5 am: 7c05674594
am: 08f437f2b4
Change-Id: Ic6c4b5b73064e6e1a0fa1e113caf3c638f09ae5d
|
2018-05-17 18:43:23 -07:00 |
|
Calin Juravle
|
5e38cbb831
|
Merge "Allow adb to pull profile snapshots" into pi-dev
am: b7aea6d3e2
Change-Id: Ib2c9610a392281bececffc925e5102dfc4b48209
|
2018-05-17 18:39:56 -07:00 |
|
Bill Yi
|
35fdd1e3d1
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours am: a1df530ac7 -s ours
am: 407d517cb8 -s ours
Change-Id: If2961de1aeb6216c482b84b9fd00657c8d3e47bb
|
2018-05-17 18:37:26 -07:00 |
|
Bill Yi
|
d620aa5fd0
|
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa am: aaddf187e4
am: 1803fec75f
Change-Id: I3f4f5501d41ea3b39ff616c0789f2be7b3ced54b
|
2018-05-17 18:32:19 -07:00 |
|
Bill Yi
|
740543d1b5
|
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc am: 5897727afc am: 8993fe413b
am: 140b527cb8
Change-Id: Ib10cf223ee1d05930eb8ffe997a6edd40eca3440
|
2018-05-17 18:28:54 -07:00 |
|
Bill Yi
|
3befcfc215
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours am: eef34578b3 -s ours
am: ede8c555e0 -s ours
Change-Id: I0e5265b0cbc53856af61f0f7540ec9c265d28438
|
2018-05-17 18:25:29 -07:00 |
|
Bill Yi
|
a32e326b6d
|
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f am: 4bfac58817 -s ours am: 60682c726c -s ours am: ea4170f954 -s ours
am: 00f925e729 -s ours
Change-Id: Ifd3e686efb8e4dddc1b4f00dc217c1e4b2dd286b
|
2018-05-17 18:21:17 -07:00 |
|
Bill Yi
|
e388855c62
|
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a
am: 4d58eb3bc1
Change-Id: I9bdbdaadbe40bba74e9ca9186e88d6881c25e022
|
2018-05-17 18:14:50 -07:00 |
|
Bill Yi
|
1449d3dbca
|
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c2b am: 43539011e4 am: 6aaa85d953
am: 57938aab4c
Change-Id: I1c1b16d93b2df8200752693c0c38ccd7af2a8895
|
2018-05-17 18:11:33 -07:00 |
|
Bill Yi
|
4ec0ca5336
|
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 am: f028e75015 -s ours
am: c22431c753 -s ours
Change-Id: I186355d9122a1eb12b968ff05e91a631f1189b45
|
2018-05-17 18:09:52 -07:00 |
|
Bill Yi
|
bb00cd0f8d
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d am: 81a6ef98f3 -s ours am: 4fb03f2730 -s ours am: 10a8d67215 -s ours
am: a032cabf5e -s ours
Change-Id: I6fab320466c4686897e7600c976daf776278e762
|
2018-05-17 18:04:34 -07:00 |
|
Bill Yi
|
5ed1b8864a
|
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am: c844ea5c96
am: 44042a74c7
Change-Id: I39a0f64a8a2cb75fee5d9caf50c249f43637762f
|
2018-05-17 18:03:39 -07:00 |
|
Android Build Merger (Role)
|
8e9cab7943
|
Merge changes from topic "am-d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev
* changes:
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc am: 1ea636faa9 am: e5eaa05dd9
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours am: aa961b929b -s ours am: 1190c6d633 -s ours
|
2018-05-18 01:00:22 +00:00 |
|
Bill Yi
|
6d00a582af
|
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc am: 1ea636faa9
am: e5eaa05dd9
Change-Id: I02abac786f8297ff2dfc225d3f93f82bd7904016
|
2018-05-17 17:59:42 -07:00 |
|
Bill Yi
|
1531155e0d
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423 am: f3df46779d -s ours
am: 2fe6455d18 -s ours
Change-Id: Iddb6db689a98d1f569e79da1a96d716c49cdd5e0
|
2018-05-17 17:58:50 -07:00 |
|
TreeHugger Robot
|
0a72c6b08d
|
Merge "Do not allow bouncer translation when scrimmed" into pi-dev
|
2018-05-18 00:55:35 +00:00 |
|
Bill Yi
|
c2a90162af
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours am: aa961b929b -s ours
am: 1190c6d633 -s ours
Change-Id: I6288d9d8afc635d3465b45b701079738e37f41c9
|
2018-05-17 17:53:05 -07:00 |
|
Bill Yi
|
08f437f2b4
|
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5
am: 7c05674594
Change-Id: I8da971740edb6e110fc02bc5ae4e92a3072b3637
|
2018-05-17 17:52:28 -07:00 |
|
TreeHugger Robot
|
a42d8f6e89
|
Merge "Fix issue where guts would require bouncer" into pi-dev
|
2018-05-18 00:51:36 +00:00 |
|
Bill Yi
|
407d517cb8
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours
am: a1df530ac7 -s ours
Change-Id: I06393327f4c6cfd8c5c6e4e17d19e2b21817b040
|
2018-05-17 17:47:23 -07:00 |
|
Calin Juravle
|
b7aea6d3e2
|
Merge "Allow adb to pull profile snapshots" into pi-dev
|
2018-05-18 00:45:14 +00:00 |
|
Bill Yi
|
140b527cb8
|
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc am: 5897727afc
am: 8993fe413b
Change-Id: I05a5acac4a59d51d8a76abbde75f69a76f8acac2
|
2018-05-17 17:42:48 -07:00 |
|
Bill Yi
|
1803fec75f
|
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa
am: aaddf187e4
Change-Id: I674bd5be030c34e37443c8746c40bcae2704e1b2
|
2018-05-17 17:41:19 -07:00 |
|
Bill Yi
|
00f925e729
|
[automerger skipped] Import translations. DO NOT MERGE skipped: a574713e4d skipped: e7c60be83f am: 4bfac58817 -s ours am: 60682c726c -s ours
am: ea4170f954 -s ours
Change-Id: I1bb9e3f8b411deaaade34a3e0a8f9c0152f4fc6b
|
2018-05-17 17:36:14 -07:00 |
|
Bill Yi
|
ede8c555e0
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours
am: eef34578b3 -s ours
Change-Id: Ic0a169bd1c11dec7e4bcc8d7a8a2a9ba30d72a6b
|
2018-05-17 17:35:54 -07:00 |
|
Bill Yi
|
dc20f59d06
|
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am: c6c611293d am: b2f28267ad am: 8d249b91bd
am: d51b62acb0
Change-Id: I802a047d0219a63ef633a48f64d69abd70c9845b
|
2018-05-17 17:30:52 -07:00 |
|
Bill Yi
|
57938aab4c
|
Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev am: 9ede115c2b am: 43539011e4
am: 6aaa85d953
Change-Id: I18a0f5624fca0ff47e28c7a04849ec44fb2c9833
|
2018-05-17 17:30:04 -07:00 |
|
Bill Yi
|
e5eaa05dd9
|
Merge changes from topic "am-d375c8a9-01d8-44da-9ef2-2e866e457b89" into oc-dev am: e936691bfc
am: 1ea636faa9
Change-Id: I26d60740cd9afc04529a9fb431786c7829ef84f6
|
2018-05-17 17:29:10 -07:00 |
|
Bill Yi
|
a032cabf5e
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 053b375862 skipped: a7875e6a7d am: 81a6ef98f3 -s ours am: 4fb03f2730 -s ours
am: 10a8d67215 -s ours
Change-Id: I43c5a13ff556927a28b931645e197fa09c34b371
|
2018-05-17 17:23:03 -07:00 |
|
Bill Yi
|
1190c6d633
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours
am: aa961b929b -s ours
Change-Id: Ic0790355c37d9f3501b519dc773466a53f41b3cc
|
2018-05-17 17:23:00 -07:00 |
|
Bill Yi
|
88616573b5
|
[automerger skipped] Import translations. DO NOT MERGE skipped: 379dacd8c2 skipped: 20306f6ce0 am: fb795ed727 -s ours am: c31d960f5e -s ours am: 3382016c1a -s ours
am: 638c648dc3 -s ours
Change-Id: I6b6bcb29f45168856ce4b49704d980d3d3768e84
|
2018-05-17 17:22:50 -07:00 |
|
Bill Yi
|
8993fe413b
|
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc
am: 5897727afc
Change-Id: I9fa868feb79839c8090ba44901c09602d48a00d9
|
2018-05-17 17:10:29 -07:00 |
|
Bill Yi
|
4d58eb3bc1
|
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev
am: abf0ff542a
Change-Id: Id3b645350fefaee4071d56d6e4bd368fa535350e
|
2018-05-17 17:09:03 -07:00 |
|
Bill Yi
|
d51b62acb0
|
Merge changes from topic "am-d1fbdf53-dccb-4215-99ff-b24698b6bec8" into oc-dev am: c6c611293d am: b2f28267ad
am: 8d249b91bd
Change-Id: I98106dea821a12efd704adc279212136971f76bb
|
2018-05-17 17:07:45 -07:00 |
|