Chenbo Feng
|
3c43220ac2
|
Merge "Check for bpf support at NetworkStatsService start" into pi-dev am: 6555a9fa16
am: e20463ba06
Change-Id: Ib5acef029a83ce8fa219a8b7d1edc17c71fc2df5
|
2018-05-21 12:50:12 -07:00 |
|
Lucas Dupin
|
cbd50546f4
|
Merge "Keep scrim black when "always on" is off" into pi-dev am: 402e2a2b6f
am: 1c63bdcce2
Change-Id: I38cfb0e6560e70c4a9bb66d48a18cdc5d84b89f8
|
2018-05-21 12:45:48 -07:00 |
|
Chenbo Feng
|
e20463ba06
|
Merge "Check for bpf support at NetworkStatsService start" into pi-dev
am: 6555a9fa16
Change-Id: If2fd9e040e4717f1040c16e4b5f6c61cfc14e140
|
2018-05-21 12:44:23 -07:00 |
|
Yohei Yukawa
|
bc38f6c47a
|
Merge "Add a shell command for IMMS to test instant apps" into pi-dev am: 711a8f7f28
am: 682b36a5ae
Change-Id: Ia0269a871d174e02a9d3a8a59d6f5be92cde3f9b
|
2018-05-21 12:40:59 -07:00 |
|
Lucas Dupin
|
1c63bdcce2
|
Merge "Keep scrim black when "always on" is off" into pi-dev
am: 402e2a2b6f
Change-Id: Iecc4ff6e4f1861e8adec33e912d71be051ccb98d
|
2018-05-21 12:36:44 -07:00 |
|
Yohei Yukawa
|
682b36a5ae
|
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
am: 711a8f7f28
Change-Id: I7ac74ec1076ad7160475b9595e00db85eea9f818
|
2018-05-21 12:29:13 -07:00 |
|
Yangster-mac
|
c038bfeebd
|
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev am: 76cb7fe2f6
am: 02b40158ab
Change-Id: I7445eb13283b007738182e2a5ac4808a87124a11
|
2018-05-21 12:27:13 -07:00 |
|
TreeHugger Robot
|
6555a9fa16
|
Merge "Check for bpf support at NetworkStatsService start" into pi-dev
|
2018-05-21 19:19:59 +00:00 |
|
Ben Wagner
|
10b0fc15a8
|
Merge "Clean up Bitmap allocation size computation."
|
2018-05-21 19:19:08 +00:00 |
|
Ryan Mitchell
|
d692b8665e
|
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev am: fd37ec90b8
am: b3da3a9673
Change-Id: Ic715bc6db56328c47da4a30a3e46ea92bbf10f92
|
2018-05-21 12:06:13 -07:00 |
|
Yangster-mac
|
02b40158ab
|
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
am: 76cb7fe2f6
Change-Id: I4bb331330c505396427bb72ff7b69c2b6653ba97
|
2018-05-21 12:01:32 -07:00 |
|
Bill Yi
|
65db3f4cfb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 35426e5e69 -s ours
am: 33ad5a99dd -s ours
Change-Id: Ifc05f3503a635804c9008e28ccc5cf807f69905b
|
2018-05-21 11:57:10 -07:00 |
|
Ryan Mitchell
|
b3da3a9673
|
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
am: fd37ec90b8
Change-Id: I3030d62104142b33dfb9844faa2fcb9840d8ee61
|
2018-05-21 11:53:56 -07:00 |
|
Bill Yi
|
f9216a4d23
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 346e04785d -s ours
am: 491a78548b -s ours
Change-Id: I31e6a4d193027b9bad66d36e391bff93be6928b6
|
2018-05-21 11:43:21 -07:00 |
|
Bill Yi
|
33ad5a99dd
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 35426e5e69 -s ours
Change-Id: I9ca85e02a0ab28401d9c5715180e8b0323d75c30
|
2018-05-21 11:42:56 -07:00 |
|
Andreas Gampe
|
2d103db6c9
|
Merge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9 am: 2d47ac0df7
am: 1c015160c6
Change-Id: Id3bd33caa4137b36b7ead74689bf2c0aaa09e3d4
|
2018-05-21 11:41:58 -07:00 |
|
Bill Yi
|
f02176f345
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f28ef47762 -s ours
am: 38f9bb955a -s ours
Change-Id: I58084ac82e5999d5ff8443cc1fddbbea99a1cbee
|
2018-05-21 11:37:07 -07:00 |
|
Bill Yi
|
12ca1f9783
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3743438f5e -s ours
am: 3047866348 -s ours
Change-Id: I807d5fc4dec148159c2dcd57292b7dc6661491bf
|
2018-05-21 11:35:29 -07:00 |
|
Bill Yi
|
3c7e92890b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 998221a361 -s ours
am: 7fb9123a74 -s ours
Change-Id: Ia18a28f533332b12ad01856a81041ff3071d53b6
|
2018-05-21 11:32:56 -07:00 |
|
Bill Yi
|
491a78548b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 346e04785d -s ours
Change-Id: I6f15d6341bd4574d65dd9c0eb08fc80482386beb
|
2018-05-21 11:32:41 -07:00 |
|
Bill Yi
|
2b01db86af
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: addcc20dd4 -s ours
am: 06d509f642 -s ours
Change-Id: I0f94f3a65fd6215824d3743025d8902e995c096e
|
2018-05-21 11:31:06 -07:00 |
|
Andreas Gampe
|
1c015160c6
|
Merge "ActivityManager: Fix slow-app ANR dumping" am: 923208e8c9
am: 2d47ac0df7
Change-Id: Ie4274380bb66a35a6ba12d0f868ae78ef80f4b0d
|
2018-05-21 11:25:06 -07:00 |
|
Lucas Dupin
|
402e2a2b6f
|
Merge "Keep scrim black when "always on" is off" into pi-dev
|
2018-05-21 18:23:59 +00:00 |
|
Bill Yi
|
38f9bb955a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: f28ef47762 -s ours
Change-Id: Ieed9e65080e7aba8701d23ef5b416fc4b896ea7f
|
2018-05-21 11:18:24 -07:00 |
|
Bill Yi
|
24d326bfa6
|
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da am: aa55d5db76 am: b138eaa7b7
am: 370e6da71a
Change-Id: I992104d24ba9708f8ccb34a2871c2104acf6f9ec
|
2018-05-21 11:18:03 -07:00 |
|
Andreas Gampe
|
2d47ac0df7
|
Merge "ActivityManager: Fix slow-app ANR dumping"
am: 923208e8c9
Change-Id: Ifed1ed567587b7616880f3b640d3162c57a40644
|
2018-05-21 11:17:24 -07:00 |
|
Bill Yi
|
3047866348
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 3743438f5e -s ours
Change-Id: I92b0c74b35b8b5d6e98053202d8529e25fee3eaf
|
2018-05-21 11:17:01 -07:00 |
|
TreeHugger Robot
|
711a8f7f28
|
Merge "Add a shell command for IMMS to test instant apps" into pi-dev
|
2018-05-21 18:15:43 +00:00 |
|
Bill Yi
|
7fb9123a74
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 998221a361 -s ours
Change-Id: I85f9d555bfdf76d0b0ebcfc25c351304c208b9ef
|
2018-05-21 11:13:26 -07:00 |
|
Bill Yi
|
06d509f642
|
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: addcc20dd4 -s ours
Change-Id: Id0247616a981fcc59b0956bf0ba29f0e96d7980a
|
2018-05-21 11:11:36 -07:00 |
|
Bill Yi
|
2e2d5f5548
|
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661 -s ours am: a53d91e485 -s ours am: 5e1f17a880 -s ours am: 91d2623fe0 -s ours
am: 654d5044ef -s ours
Change-Id: I403ab21dbffb7d9b091d412a3504cedd1aca9f2f
|
2018-05-21 11:10:57 -07:00 |
|
TreeHugger Robot
|
76cb7fe2f6
|
Merge "Add a field in config to disable/enable the string hashing in metric report." into pi-dev
|
2018-05-21 18:05:00 +00:00 |
|
Bill Yi
|
370e6da71a
|
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da am: aa55d5db76
am: b138eaa7b7
Change-Id: Idf0ba5b3480762902f3df610bd313653c2111550
|
2018-05-21 11:04:38 -07:00 |
|
TreeHugger Robot
|
fd37ec90b8
|
Merge "ResXMLTree: Clone DynamicRefTable on creation" into pi-dev
|
2018-05-21 17:59:35 +00:00 |
|
Bill Yi
|
654d5044ef
|
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661 -s ours am: a53d91e485 -s ours am: 5e1f17a880 -s ours
am: 91d2623fe0 -s ours
Change-Id: I66d8b302db8bd7f2397cfeff65a73fa96f6c28fa
|
2018-05-21 10:57:38 -07:00 |
|
TreeHugger Robot
|
35426e5e69
|
Merge "Import translations. DO NOT MERGE" into pi-dev
|
2018-05-21 17:57:26 +00:00 |
|
TreeHugger Robot
|
346e04785d
|
Merge "Import translations. DO NOT MERGE" into pi-dev
|
2018-05-21 17:56:41 +00:00 |
|
TreeHugger Robot
|
f28ef47762
|
Merge "Import translations. DO NOT MERGE" into pi-dev
|
2018-05-21 17:54:35 +00:00 |
|
TreeHugger Robot
|
3743438f5e
|
Merge "Import translations. DO NOT MERGE" into pi-dev
|
2018-05-21 17:54:31 +00:00 |
|
TreeHugger Robot
|
998221a361
|
Merge "Import translations. DO NOT MERGE" into pi-dev
|
2018-05-21 17:53:32 +00:00 |
|
TreeHugger Robot
|
addcc20dd4
|
Merge "Import translations. DO NOT MERGE" into pi-dev
|
2018-05-21 17:51:35 +00:00 |
|
Bernie Innocenti
|
8694baf76e
|
[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316 am: 0ec7b1e85e -s ours
am: 7ef34d8629 -s ours
Change-Id: I2ce8a520f0bb744329bb7c9c2782bdbc1f8ace3f
|
2018-05-21 10:42:13 -07:00 |
|
Bill Yi
|
b138eaa7b7
|
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e am: d88c6877da
am: aa55d5db76
Change-Id: If6e65aa957489e085d1a96be0367e158c43ebc5b
|
2018-05-21 10:41:15 -07:00 |
|
Bill Yi
|
91d2623fe0
|
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661 -s ours am: a53d91e485 -s ours
am: 5e1f17a880 -s ours
Change-Id: I5fdb579286d6ddce6f6a20b2fab243b33840bf93
|
2018-05-21 10:34:57 -07:00 |
|
Bernie Innocenti
|
7ef34d8629
|
[automerger skipped] Merge changes from topic "apf-read-ram" am: b5dda0e316
am: 0ec7b1e85e -s ours
Change-Id: I8fac093bd2a55d6c59856374fa31d88207fc7623
|
2018-05-21 10:32:00 -07:00 |
|
Bill Yi
|
aa55d5db76
|
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev am: 99e6aa1b1e
am: d88c6877da
Change-Id: I0acd60a59fcb928752ce7bf952bbfe9f65b68ff4
|
2018-05-21 10:28:44 -07:00 |
|
Roshan Pius
|
d7fece947a
|
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev am: 95509057f8
am: dee99a1b2b
Change-Id: I9274ba934a102a17d554133caed5ede6cce551b0
|
2018-05-21 10:26:51 -07:00 |
|
Bill Yi
|
5e1f17a880
|
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477 am: 4f1f428661 -s ours
am: a53d91e485 -s ours
Change-Id: Ife13f7c8262521ddc28deb4ceaf5b27b9765c792
|
2018-05-21 10:24:41 -07:00 |
|
Roshan Pius
|
dee99a1b2b
|
Merge "WifiConfiguration: New temp disable network status for no internet" into pi-dev
am: 95509057f8
Change-Id: I73fc1ed24e79689315ed5d4501a412afce24f6e8
|
2018-05-21 10:20:11 -07:00 |
|
Bill Yi
|
d88c6877da
|
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
am: 99e6aa1b1e
Change-Id: Id35ca83236112898b4e39b3cb173be70c435168f
|
2018-05-21 10:19:31 -07:00 |
|