Android Build Merger (Role)
bbf9d183aa
Merge "Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled am: a775ad997b am: 1ec95aaa26"
2016-12-19 18:48:09 +00:00
Michal Karpinski
21d5a07edc
Initialize AtomicBoolean for NetworkLogger#mIsLoggingEnabled am: a775ad997b
...
am: 1ec95aaa26
2016-12-19 18:47:19 +00:00
Android Build Merger (Role)
705bcc8181
Merge changes from topic 'am-2e3c510745c349ef8379b216cc85be0a'
...
* changes:
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev am: 85f3996d722cb7bad13e2299a1c401e55546a12793c0de0a356b480eca3f097bde6c8f3fc3dc26024c9d3f19cd66346ab78c
2016-12-19 18:46:50 +00:00
Hugo Benichi
ff513c4105
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev am: 85f3996d72
...
am: 2cb7bad13e
2016-12-19 18:43:55 +00:00
Hugo Benichi
42b9d13c6f
DO NOT MERGE IP Connectivity metrics: add connect() statistics am: 2299a1c401
...
am: e55546a127
2016-12-19 18:43:05 +00:00
Hugo Benichi
42a6d5f535
DO NOT MERGE Fix IP connectivity metrics tests am: 93c0de0a35
...
am: 6b480eca3f
2016-12-19 18:42:07 +00:00
Sergei Vasilinetc
8b6fe1d894
Merge "Support Bitmap.copy for hardware bitmaps"
2016-12-19 18:41:21 +00:00
Hugo Benichi
cf897fad83
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics am: 097bde6c8f
...
am: 3fc3dc2602
2016-12-19 18:40:59 +00:00
Hugo Benichi
f19ebf1567
DO NOT MERGE IP connectivity metrics: add transport field. am: 4c9d3f19cd
...
am: 66346ab78c
2016-12-19 18:40:10 +00:00
Android Build Merger (Role)
46cbd1cef8
Merge "Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev am: 05d36569b6 am: 58b3f35e9f"
2016-12-19 18:39:54 +00:00
Philipp Weiß
e1f7b756a7
Merge "Rework Device Monitoring Dialog in Quicksettings"
2016-12-19 18:39:44 +00:00
Hugo Benichi
df40df6f8b
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev am: 05d36569b6
...
am: 58b3f35e9f
2016-12-19 18:38:36 +00:00
Android Build Merger (Role)
1c9c541864
Merge "DO NOT MERGE Network notifications: revamp keying scheme am: 84daaea8fd am: 7f907b0341 -s ours"
2016-12-19 18:38:12 +00:00
Hugo Benichi
9e188efb74
DO NOT MERGE Network notifications: revamp keying scheme am: 84daaea8fd
...
am: 7f907b0341
2016-12-19 18:36:10 +00:00
Android Build Merger (Role)
58638522d2
Merge "DO NOT MERGE Define Network notification proto constants. am: 065acc5a6c am: 4778249ab0 -s ours"
2016-12-19 18:35:49 +00:00
Joe LaPenna
e140616718
Fix malformed log statement.
...
Introduced in I1201d1d4fab8183dd83449c2afb2c35cfece883f
BUG: 33746580
Test: built, triggered notification, no crash.
Change-Id: Ia3e5370f95a6cea421ae0d3febdc5e3fe156dceb
2016-12-19 10:35:10 -08:00
Hugo Benichi
e57bdf2f2c
DO NOT MERGE Define Network notification proto constants. am: 065acc5a6c
...
am: 4778249ab0
2016-12-19 18:34:51 +00:00
Android Build Merger (Role)
37800bcddc
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager am: d3da17a260 am: 04507a635b -s ours"
2016-12-19 18:34:31 +00:00
Hugo Benichi
60f2f10227
DO NOT MERGE Unit tests for NetworkNotificationManager am: d3da17a260
...
am: 04507a635b
2016-12-19 18:33:39 +00:00
Android Build Merger (Role)
403e88745a
Merge changes from topic 'am-f02ad5c3f5b3496088762ec97d2006ca'
...
* changes:
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev am: 64bc2580e37f58ca8af4e8fe0aaab92f30e611eb
2016-12-19 18:33:13 +00:00
Marie Janssen
5e9774c184
resolve merge conflicts of ffcf88f to nyc-mr2-dev-plus-aosp
...
Change-Id: Ib8c2e6770448bda00c0d64b42ce0495049acb268
2016-12-19 10:32:20 -08:00
Manu Cornet
42fb2e4131
Merge "2d Recents: show full task thumbnail and don't overlap header"
2016-12-19 18:32:18 +00:00
Hugo Benichi
41e4e3e175
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev am: 64bc2580e3
...
am: 7f58ca8af4
2016-12-19 18:31:39 +00:00
Manu Cornet
f8783bc651
Merge "2D Recents: tweak task view header height"
2016-12-19 18:31:34 +00:00
Hugo Benichi
79010b27c0
DO NOT MERGE Netd events: record connect() success/errno am: e8fe0aaab9
...
am: 2f30e611eb
2016-12-19 18:30:46 +00:00
Hugo Benichi
03835f7a63
Captive portals: login activity probes like NetworkMonitor am: cdf3ba48cc
...
am: 403ea607a5
2016-12-19 18:29:41 +00:00
Michael Rosenfeld
0521b69fd9
Merge "Clean up local hprofs" am: 9ab94e15c7 am: 1876d82450 am: 67fd9f3968
...
am: bf5546b1e2
2016-12-19 18:28:38 +00:00
Marie Janssen
be64e03993
Merge "Bluetooth: fix issues re-enabling after crash" am: e2c22e38d5 am: ff0d3e1c8d -s ours am: 7fd7bc57ee
...
am: 02daba1e72
2016-12-19 18:27:22 +00:00
Joe Fernandez
82a551c515
Merge "docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4 am: 206d947de9" into nyc-mr2-dev-plus-aosp
...
am: 21014b81be
2016-12-19 18:25:42 +00:00
Joe Fernandez
1c256217a8
docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4 am: 206d947de9
...
am: 88136284e2
2016-12-19 18:25:32 +00:00
Joe Fernandez
54aa56a5fe
docs: Add deprecation message for the developer.android.com docs am: b9bd6cca9e am: 045ae0458a am: e161f75d38 am: 536dc4ecc4 am: bd7fab30dc
...
am: 4c7e06b361
2016-12-19 18:24:10 +00:00
Svet Ganov
3bfcc83316
Merge "[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba am: 5857a47008" into nyc-mr2-dev-plus-aosp
...
am: 89bf2239de
2016-12-19 18:22:25 +00:00
Svet Ganov
a3c2c07e59
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba am: 5857a47008
...
am: a3044b0214
2016-12-19 18:22:21 +00:00
Svet Ganov
61ed7b5521
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00 -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba am: d10857f210
...
am: c2181a63e0
2016-12-19 18:21:11 +00:00
Mark Lu
c855076a88
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 760d127583" into nyc-mr2-dev-plus-aosp
...
am: 1784848976
2016-12-19 18:19:27 +00:00
Mark Lu
25fb408110
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 760d127583
...
am: dc031941bf
2016-12-19 18:19:18 +00:00
Mark Lu
8a5f33a19a
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 68b2be6105" into nyc-mr2-dev-plus-aosp
...
am: 60dbafb19c
2016-12-19 18:17:30 +00:00
Mark Lu
bebba07060
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 68b2be6105
...
am: ce2d5723cb
2016-12-19 18:17:24 +00:00
Mark Lu
ebc6729cb9
Merge "docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed am: c9328c18a4" into nyc-mr2-dev-plus-aosp
...
am: 38dbcd1997
2016-12-19 18:15:48 +00:00
Mark Lu
0e1c35ac30
docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed am: c9328c18a4
...
am: 1c64c32051
2016-12-19 18:15:42 +00:00
Mark Lu
cab02c5b3a
docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed am: 2b77de3a44
...
am: f34e9fc48d
2016-12-19 18:14:24 +00:00
Justin Klaassen
f77c05b9f2
Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev am: 868a859fd7
...
am: 0169932c51
2016-12-19 18:13:05 +00:00
Adam Lesinski
497516d04b
Reset BatteryStats when too large for clients to handle am: 45489787d7
...
am: 66c7e9c20e
2016-12-19 18:12:00 +00:00
Philip P. Moltmann
ce2118c323
Merge "Increment vers of PrintRecommendationService" am: 08bff42ef4 am: a791fee2bc am: fbdcaa7278
...
am: 72c7cce18f
2016-12-19 18:10:55 +00:00
Vitalii Tomkiv
22cabc86f1
Merge changes Ic85892b4,I627e47c6 am: d995c94426 am: d49df21f80 am: 82160ca083
...
am: f50eacf203
2016-12-19 18:08:50 +00:00
Vitalii Tomkiv
2450bf1820
Make sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a6 am: 7f797cc54c am: 9dd81c9170
...
am: 9d6fd9d734
2016-12-19 18:07:36 +00:00
Todd Kjos
2549d22f46
Revert "Add boost to increase the load on newly-forked zygote processes." am: 8175f0955a am: 501875bbe8 -s ours am: 391d3e1aad
...
am: e9e98f9cea
2016-12-19 18:06:42 +00:00
Kweku Adams
ba4cd0bc4b
Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev am: 1decad5e8c
...
am: 05cf63f3d7
2016-12-19 18:05:33 +00:00
Kweku Adams
845355c428
Fixing issue in current and max duration calculations. am: c6bd4243a4
...
am: c9430110da
2016-12-19 18:04:22 +00:00
Philipp Weiß
5c49897d8c
Merge "DO NOT MERGE Add network logging icon to Quicksettings when enabled" into nyc-mr2-dev
...
am: f84f98c4e2
2016-12-19 18:03:53 +00:00
