OSDN Git Service
Santos Cordon [Thu, 11 May 2017 02:12:51 +0000 (02:12 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp
am:
baed8c1321 -s ours
Change-Id: Ib20ce42245c768fae31e2152ac8ec02ac886630c
Santos Cordon [Thu, 11 May 2017 01:48:18 +0000 (01:48 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)"
Adrian Roos [Thu, 11 May 2017 00:02:24 +0000 (00:02 +0000)]
Merge "Enable Always On mode by default."
Bryce Lee [Wed, 10 May 2017 23:04:38 +0000 (23:04 +0000)]
Merge "Use application context getting secondary displays." into oc-dev am:
456882b5ae
am:
356cccd67c
Change-Id: I291e1249e9e0b5a975faade4ee105b3e6711db67
Hall Liu [Wed, 10 May 2017 22:39:10 +0000 (22:39 +0000)]
Merge "Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2 am:
dba95b0c94" into oc-dev-plus-aosp
am:
cae12de52a
Change-Id: I759e44a846f638e3c6ff1f8325e5f05a6e0a253f
Jason Monk [Wed, 10 May 2017 22:16:17 +0000 (22:16 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev am:
53ae4dbf8c
am:
e3cbbb88ac
Change-Id: If4aa6ec3f1c6f9ab012c41c4def7d4d0a85630f0
Jason Monk [Wed, 10 May 2017 22:09:03 +0000 (22:09 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev am:
66c81e379e
am:
a449d85714
Change-Id: Idd820e8465a41a6970fa572e6041f491ff7de1f2
Robert Greenwalt [Wed, 10 May 2017 22:05:27 +0000 (22:05 +0000)]
Merge "Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb am:
331058a871" into oc-dev-plus-aosp
am:
07f060227d
Change-Id: Ibf7f4aed57b592373ff37f1b2b40f72f3cc25d90
TreeHugger Robot [Wed, 10 May 2017 21:18:46 +0000 (21:18 +0000)]
Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp
Michael Wright [Wed, 10 May 2017 18:49:06 +0000 (19:49 +0100)]
Enable Always On mode by default.
Also, add a config value for always on display availability.
Test: runtest -x tests/src/com/android/systemui/doze
Change-Id: Id5e0136a5bed0eac78ad48147b0bef8311b06986
Lei Yu [Wed, 10 May 2017 20:42:01 +0000 (20:42 +0000)]
Merge "Add method to get bluetooth mac"
Ahmed ElArabawy [Wed, 10 May 2017 20:37:39 +0000 (20:37 +0000)]
Merge "power hal: Use power HAL API 1.1"
Santos Cordon [Wed, 5 Apr 2017 17:31:15 +0000 (10:31 -0700)]
Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds :
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.
Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input". Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest
Bug:
36051620
Change-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c
Bryce Lee [Wed, 10 May 2017 19:22:15 +0000 (19:22 +0000)]
Merge "Use application context getting secondary displays." into oc-dev
am:
456882b5ae
Change-Id: Ib45a340b34f11f0112c91893893f32e0a849cf93
Android Build Merger (Role) [Wed, 10 May 2017 19:00:42 +0000 (19:00 +0000)]
Merge "Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2 am:
dba95b0c94" into oc-dev-plus-aosp
Jason Monk [Wed, 10 May 2017 18:59:39 +0000 (18:59 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev am:
175f53b2d6
am:
aee0dd3ab0
Change-Id: I75f50fea8b504f7058fda5e83320e172ad298649
Hall Liu [Wed, 10 May 2017 18:58:23 +0000 (18:58 +0000)]
Merge "Increase limit of locale pairs" am:
aa9a59ab32 am:
22ff1759d2
am:
dba95b0c94
Change-Id: I7135571a65625f3aa3ada7a0c1b00f08c565fce9
Jason Monk [Wed, 10 May 2017 18:54:34 +0000 (18:54 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev
am:
53ae4dbf8c
Change-Id: I7409558792e77fa16f0e4b95fdf7ae40e59ed1ed
Hall Liu [Wed, 10 May 2017 18:31:12 +0000 (18:31 +0000)]
Merge "Increase limit of locale pairs" am:
aa9a59ab32
am:
22ff1759d2
Change-Id: Ib993597558b13e9879dc56014af8529aa84c4480
Jason Monk [Wed, 10 May 2017 18:26:53 +0000 (18:26 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev
am:
66c81e379e
Change-Id: I8feecad17a1613bd6774a6a557f8986b300c38b0
Rebecca Silberstein [Wed, 10 May 2017 18:18:52 +0000 (18:18 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev am:
ed285e0cd6
am:
a5b8380b03
Change-Id: I1fab5a10644d7f24a304e24f373461c72c03d9a6
TreeHugger Robot [Wed, 10 May 2017 18:16:10 +0000 (18:16 +0000)]
Merge "Notify ImsService Status Correctly"
Android Build Merger (Role) [Wed, 10 May 2017 18:00:10 +0000 (18:00 +0000)]
Merge "Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb am:
331058a871" into oc-dev-plus-aosp
Jason Monk [Wed, 10 May 2017 17:51:02 +0000 (17:51 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev
am:
175f53b2d6
Change-Id: Ic062c499bbb5a5aade5da15a6a038324e47a866e
Robert Greenwalt [Wed, 10 May 2017 17:50:17 +0000 (17:50 +0000)]
Merge "Update startStreaming to return status code" am:
6476ceeaee am:
a89cacebfb
am:
331058a871
Change-Id: Ie2bc9f47e7774a838829720379fc5865e71d2f0f
TreeHugger Robot [Wed, 10 May 2017 17:43:57 +0000 (17:43 +0000)]
Merge "Support different SIM power states"
Robert Greenwalt [Wed, 10 May 2017 17:35:34 +0000 (17:35 +0000)]
Merge "Update startStreaming to return status code" am:
6476ceeaee
am:
a89cacebfb
Change-Id: Ief49d5e046bc9a3396f16ec81a2196a2c3b9557b
Rebecca Silberstein [Wed, 10 May 2017 17:35:27 +0000 (17:35 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
am:
ed285e0cd6
Change-Id: Iae9b1317dc53a8213861ff3803764f9d45758f71
Jean-Michel Trivi [Wed, 10 May 2017 17:18:33 +0000 (17:18 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev am:
f86d68d447
am:
f92b4ec5b0
Change-Id: I80613c2fa0ded16c846a8168e44c7f3f30e15d99
Hall Liu [Wed, 10 May 2017 17:15:31 +0000 (17:15 +0000)]
Merge "Increase limit of locale pairs"
am:
aa9a59ab32
Change-Id: I4f9d25169bbd7e53c5396e944613e8c15fe4e308
Robert Greenwalt [Wed, 10 May 2017 17:11:12 +0000 (17:11 +0000)]
Merge "Update startStreaming to return status code"
am:
6476ceeaee
Change-Id: I92f8fad5bff456b158ba2afd55c3065678b0d5cf
Lucas Dupin [Wed, 10 May 2017 17:04:15 +0000 (17:04 +0000)]
Merge "New palette picking algorithm"
Andreas Gampe [Wed, 10 May 2017 16:50:38 +0000 (16:50 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev am:
ab516db3e6
am:
6a580bef1f
Change-Id: I3a75fb705d58211c2ecf6937b61722fa12294fd5
Jean-Michel Trivi [Wed, 10 May 2017 16:50:19 +0000 (16:50 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev
am:
f86d68d447
Change-Id: I01f8c26e9a61f8ed5dd6f0b3a12d245001756796
Hall Liu [Wed, 10 May 2017 16:46:18 +0000 (16:46 +0000)]
Merge "Increase limit of locale pairs"
Treehugger Robot [Wed, 10 May 2017 16:46:12 +0000 (16:46 +0000)]
Merge "Update startStreaming to return status code"
Andreas Gampe [Wed, 10 May 2017 16:34:58 +0000 (16:34 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev
am:
ab516db3e6
Change-Id: I18d0be12e680424de3dfb48b0e1e6040e339204e
Jeff Sharkey [Wed, 10 May 2017 16:33:34 +0000 (16:33 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev am:
ab3c811678
am:
e9e899f49b
Change-Id: Ie0ef290e1b032f99cc76ab66e4999132b38d4cb3
Bryce Lee [Wed, 10 May 2017 16:27:04 +0000 (16:27 +0000)]
Merge "Use application context getting secondary displays." into oc-dev
Christine Franks [Wed, 10 May 2017 16:22:27 +0000 (16:22 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev am:
d44afb99c8
am:
c8ae9d5a60
Change-Id: I878d4dce0113535d43b9cdc9fb7d230bb38082b7
TreeHugger Robot [Wed, 10 May 2017 16:19:23 +0000 (16:19 +0000)]
Merge "Disable parts of tuner from user builds" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 16:16:17 +0000 (16:16 +0000)]
Merge "Update QS mobile data unavailable asset" into oc-dev
Julia Reynolds [Wed, 10 May 2017 16:11:39 +0000 (16:11 +0000)]
Merge "Rename the legacy notification channel" into oc-dev am:
0c34dc60c4
am:
45ba2ef24e
Change-Id: I9d6e61348602f8002889c4a39ff02354d2a99dfc
Jeff Sharkey [Wed, 10 May 2017 16:10:45 +0000 (16:10 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev
am:
ab3c811678
Change-Id: I1b45a67f2bc3e76d09f29dc59bc9a6c9dcd3d3d5
TreeHugger Robot [Wed, 10 May 2017 16:09:00 +0000 (16:09 +0000)]
Merge "Fix brightness dialog background to be light" into oc-dev
Philipp Weiß [Wed, 10 May 2017 16:08:04 +0000 (16:08 +0000)]
Merge "Implement CACert queries in SecurityController" into oc-dev am:
4c78ac9ce4
am:
47d13239c0 -s ours
Change-Id: I764b6a343522c6eceadc79182546e55d6eee9e45
Christine Franks [Wed, 10 May 2017 16:04:45 +0000 (16:04 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev
am:
d44afb99c8
Change-Id: Ia99142562cd97ad5aeec2dfa40a63d80657a2c0d
Bryce Lee [Wed, 10 May 2017 16:04:32 +0000 (16:04 +0000)]
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev am:
8a698a1721
am:
537ece988a
Change-Id: Idb7c86cae2974d31a04aefec34a6ee7baeafb7ec
Daniel Sandler [Wed, 10 May 2017 15:58:38 +0000 (15:58 +0000)]
Merge "Enable notifications during an ongoing call" into oc-dev am:
b94abe5e30
am:
1201831262
Change-Id: I135fbace8fbed83532540955c4992f1be230e38d
Rebecca Silberstein [Wed, 10 May 2017 15:43:39 +0000 (15:43 +0000)]
Merge "Create a new NETWORK_SETTINGS permission" into oc-dev
Julia Reynolds [Wed, 10 May 2017 15:42:21 +0000 (15:42 +0000)]
Merge "Rename the legacy notification channel" into oc-dev
am:
0c34dc60c4
Change-Id: I3e16fc67c83eeb711d795d0b5a72fde0525ee39d
Julia Reynolds [Wed, 10 May 2017 15:39:56 +0000 (15:39 +0000)]
Update zen introduction text am:
c12676b449
am:
966f6d716f -s ours
Change-Id: I5add8cdf9c15e6f5638f38c8d0a25592471813e0
Jean-Michel Trivi [Wed, 10 May 2017 15:30:58 +0000 (15:30 +0000)]
Merge changes from topic 'mediaplayer_gc' into oc-dev
* changes:
IAppOpsCallback has weak reference to PlayerBase
IPlayer has weak reference to PlayerBase
Philipp Weiß [Wed, 10 May 2017 15:22:07 +0000 (15:22 +0000)]
Merge "Implement CACert queries in SecurityController" into oc-dev
am:
4c78ac9ce4
Change-Id: Ic4a8e36b7f14ad8ebb2b23e76ef6c38f1bc1da72
TreeHugger Robot [Wed, 10 May 2017 15:18:11 +0000 (15:18 +0000)]
Merge "OtaDexoptService: Add missing return" into oc-dev
Tomasz Wasilczyk [Wed, 10 May 2017 15:15:14 +0000 (15:15 +0000)]
Merge "Implement tune, cancel and getProgramInformation calls of ITuner."
Jeff Sharkey [Wed, 10 May 2017 15:05:51 +0000 (15:05 +0000)]
Merge "Start building SystemApi docs again; exact output." into oc-dev
Bryce Lee [Wed, 10 May 2017 15:04:05 +0000 (15:04 +0000)]
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
am:
8a698a1721
Change-Id: I7dd30182184fc5ce6ec5e9750eaa26f174b79b38
Christine Franks [Wed, 10 May 2017 15:03:23 +0000 (15:03 +0000)]
Merge "Allow ogg files to be selected as ringtones" into oc-dev
Todd Kennedy [Wed, 10 May 2017 15:00:38 +0000 (15:00 +0000)]
Merge "Don't require BROWSABLE" into oc-dev am:
59b9a851a7
am:
857bbed067
Change-Id: I81979ec46465c22aca3a6736dd4e1e6a4b5c8c2b
Daniel Sandler [Wed, 10 May 2017 15:00:20 +0000 (15:00 +0000)]
Merge "Enable notifications during an ongoing call" into oc-dev
am:
b94abe5e30
Change-Id: I9d65601fff941d5a3764cde34f9c658ea1d2a435
Geoffrey Pitsch [Wed, 10 May 2017 14:56:50 +0000 (14:56 +0000)]
Merge "Pre-O apps can see Default Channel name." into oc-dev am:
e7fb3c9f26
am:
b6eedcc811
Change-Id: I639c8b667e83657d0bf4a25285e57548eef6c876
Julia Reynolds [Wed, 10 May 2017 14:56:21 +0000 (14:56 +0000)]
Merge "Rename the legacy notification channel" into oc-dev
Julia Reynolds [Wed, 10 May 2017 14:53:39 +0000 (14:53 +0000)]
Update zen introduction text
am:
c12676b449
Change-Id: Ibe776e22adc0fa87817d07547364ac1885e1518c
Philipp Weiß [Wed, 10 May 2017 14:46:43 +0000 (14:46 +0000)]
Merge "Implement CACert queries in SecurityController" into oc-dev
Bryce Lee [Wed, 10 May 2017 14:45:34 +0000 (14:45 +0000)]
Merge "Prevent non-fullscreen activities from influencing orientation" into oc-dev
Daniel Sandler [Wed, 10 May 2017 14:43:00 +0000 (14:43 +0000)]
Merge "Enable notifications during an ongoing call" into oc-dev
Todd Kennedy [Wed, 10 May 2017 14:33:19 +0000 (14:33 +0000)]
Merge "Don't require BROWSABLE" into oc-dev
am:
59b9a851a7
Change-Id: I4bcbcddd76b9fa4e85a0edf223a98b8c18dd791c
Geoffrey Pitsch [Wed, 10 May 2017 14:27:51 +0000 (14:27 +0000)]
Merge "Pre-O apps can see Default Channel name." into oc-dev
am:
e7fb3c9f26
Change-Id: I0ff65e977dcdd3f5113e0d5fdfa284c5cd987c8f
TreeHugger Robot [Wed, 10 May 2017 14:25:52 +0000 (14:25 +0000)]
Merge "Rounded corners support, off by default."
Jason Monk [Tue, 9 May 2017 18:19:57 +0000 (14:19 -0400)]
Disable parts of tuner from user builds
They aren't quite there yet.
Test: manual
Change-Id: I5532fe4121ab85d3baed7569c66906b5219e33e9
Fixes:
37513325
Julia Reynolds [Thu, 16 Feb 2017 20:01:36 +0000 (15:01 -0500)]
Update zen introduction text
And add alarm text to QS & volume dialog.
Fixes:
31533768
Fixes:
33815404
Test: manual
Change-Id: I82f119a8bdbfbc62b0ace752dca0fbc0d5bf8a35
Jason Monk [Wed, 10 May 2017 14:12:41 +0000 (10:12 -0400)]
Update QS mobile data unavailable asset
Test: visual
Change-Id: I23cfa7644f74875bb8803bee6bd63a1041706dbb
Fixes:
37923607
TreeHugger Robot [Wed, 10 May 2017 14:09:08 +0000 (14:09 +0000)]
Merge "Don't require BROWSABLE" into oc-dev
Jorim Jaggi [Wed, 10 May 2017 14:06:49 +0000 (14:06 +0000)]
Merge "Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am:
56b747fbac" into oc-dev-plus-aosp
am:
a8c27fb789
Change-Id: Ibc824567df259b357d8d8e02645f3ece4797caf1
Jason Monk [Wed, 10 May 2017 14:04:20 +0000 (10:04 -0400)]
Fix brightness dialog background to be light
Test: visual
Change-Id: I158af3aa79de39d463ac0b26ef7d73b0430df927
Fixes:
37763715
TreeHugger Robot [Wed, 10 May 2017 14:03:15 +0000 (14:03 +0000)]
Merge "Pre-O apps can see Default Channel name." into oc-dev
Jorim Jaggi [Wed, 10 May 2017 14:02:42 +0000 (14:02 +0000)]
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am:
56b747fbac
am:
597ee67d61
Change-Id: I5e90c529a6d8f1dc353eb53be4b15e0a07bbd7f3
Android Build Merger (Role) [Wed, 10 May 2017 13:51:16 +0000 (13:51 +0000)]
Merge "Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev am:
56b747fbac" into oc-dev-plus-aosp
Jorim Jaggi [Wed, 10 May 2017 13:46:37 +0000 (13:46 +0000)]
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev
am:
56b747fbac
Change-Id: I2aed0df46a1c1c13f6c1f5acb1a415c261643953
Diego Perez [Wed, 10 May 2017 13:44:30 +0000 (13:44 +0000)]
Merge "Removing layout from frameworks/base"
Etan Cohen [Wed, 10 May 2017 13:28:17 +0000 (13:28 +0000)]
Merge "[AWARE] Add is out-of-band utility function"
Jorim Jaggi [Wed, 10 May 2017 13:23:40 +0000 (13:23 +0000)]
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev
am:
56b747fbac
Change-Id: I9ab62dbe811757f8638e31296c61f09da0fd82a6
TreeHugger Robot [Wed, 10 May 2017 13:13:22 +0000 (13:13 +0000)]
Merge "Make sure to notify client after Keyguard has been dismissed" into oc-dev
Julia Reynolds [Mon, 8 May 2017 19:40:25 +0000 (15:40 -0400)]
Rename the legacy notification channel
Bug:
38120923
Test: make
Change-Id: Id4ee584b1420f98da57350dbc75a6449462a9c24
Jason Monk [Mon, 1 May 2017 19:37:43 +0000 (15:37 -0400)]
Rounded corners support, off by default.
Test: runtest systemui
Bug:
33208650
Change-Id: I63e11e36268e277cc1c5e70651fa5248aa8b3fc0
Paul Duffin [Wed, 10 May 2017 12:26:41 +0000 (12:26 +0000)]
Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0 am:
e73cd1f690" into nyc-mr2-dev-plus-aosp am:
e4ef5cc1e4
am:
e0262f787d
Change-Id: I16e91c3a0a4e1ffc1a36f9a15f268c10c4bb9879
Paul Duffin [Wed, 10 May 2017 12:23:17 +0000 (12:23 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0 am:
e73cd1f690 am:
21a13a84d4
am:
4db1f8ec36
Change-Id: I8edbd441741c23efdbfa300a8d04a9825ee77224
Paul Duffin [Wed, 10 May 2017 12:16:25 +0000 (12:16 +0000)]
Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0 am:
e73cd1f690" into nyc-mr2-dev-plus-aosp
am:
e4ef5cc1e4
Change-Id: I5308a08a686c3d9b5fc2e0f8d6be228881a166d0
Paul Duffin [Wed, 10 May 2017 12:12:50 +0000 (12:12 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0 am:
e73cd1f690
am:
21a13a84d4
Change-Id: Iebc061d25e9876f5dbb3af6e2b037e78c1401906
Android Build Merger (Role) [Wed, 10 May 2017 12:04:00 +0000 (12:04 +0000)]
Merge "Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0 am:
e73cd1f690" into nyc-mr2-dev-plus-aosp
Paul Duffin [Wed, 10 May 2017 11:59:02 +0000 (11:59 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0
am:
e73cd1f690
Change-Id: I99ceef172af0eb3b302178928a642baace891a2f
Paul Duffin [Wed, 10 May 2017 11:48:42 +0000 (11:48 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test" am:
9588b607f0
am:
e73cd1f690
Change-Id: Ie5b48e17c3b4f6fb4ec7c28e9d3188e233ec1794
Diego Perez [Fri, 21 Apr 2017 13:20:16 +0000 (14:20 +0100)]
Removing layout from frameworks/base
The directory is being moved to its own project in frameworks/layoutlib
Bug:
36889565
Test: Built manually
Change-Id: I69a1a826d0bac8ede1f9a337c9c1d930bbcd04f3
Paul Duffin [Wed, 10 May 2017 11:30:14 +0000 (11:30 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test"
am:
9588b607f0
Change-Id: I17d3c541190c3301b27ee09806681615d97a6240
Jerome Gaillard [Wed, 10 May 2017 11:22:27 +0000 (11:22 +0000)]
Merge "Modify font metrics computation to match Android"
Paul Duffin [Wed, 10 May 2017 11:18:42 +0000 (11:18 +0000)]
Merge "Statically include android.test.runner classes in legacy-android-test"
TreeHugger Robot [Wed, 10 May 2017 10:46:54 +0000 (10:46 +0000)]
Merge "Add tests for chooseRestorePolicy."
Hugo Benichi [Wed, 10 May 2017 09:30:01 +0000 (09:30 +0000)]
Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces" am:
1683224416 am:
cd6537edb5 am:
b323e61584
am:
7b96660a43
Change-Id: I175ffaae545d88b7bc39ab01ab3a811af7e03d60
Hugo Benichi [Wed, 10 May 2017 09:20:04 +0000 (09:20 +0000)]
Merge "NetworkStatsFactory: no double looping on stats + stacked interfaces" am:
1683224416 am:
cd6537edb5
am:
b323e61584
Change-Id: I0312882bb8885aaa65f99a445fd0554d6ac054b3
OSDN Git Service
