OSDN Git Service
Android Build Merger (Role) [Thu, 22 Jun 2017 13:55:48 +0000 (13:55 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
f9a63d0457" into oc-dr1-dev-plus-aosp
Rob Carr [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
e155b7ca8e
Change-Id: I917e8ef8d9aa83261bdbeb2200464549af9c7f70
Pavel Grafov [Thu, 22 Jun 2017 13:53:26 +0000 (13:53 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f
am:
f9a63d0457
Change-Id: Iae48fe9599a680a55024c4b377f7583e7606c870
Android Build Merger (Role) [Thu, 22 Jun 2017 13:53:00 +0000 (13:53 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
604c29006b" into oc-dr1-dev-plus-aosp
Rob Carr [Thu, 22 Jun 2017 13:51:45 +0000 (13:51 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
604c29006b
Change-Id: Ieea08ba5d0462bd28b185a59ab077a5f31e320cf
Android Build Merger (Role) [Thu, 22 Jun 2017 13:51:19 +0000 (13:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
1a588ec465 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 13:50:20 +0000 (13:50 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
131ccb00a8 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:50:02 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
1a588ec465 -s ours
Change-Id: Id6ea25f828e01b7e8aaf0b186718f830d111c797
Android Build Merger (Role) [Thu, 22 Jun 2017 13:49:33 +0000 (13:49 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
4b209f21b6 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:49:27 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
131ccb00a8 -s ours
Change-Id: I12baaccc938a1fcccdbc1ad97a18b802ffdee691
Android Build Merger (Role) [Thu, 22 Jun 2017 13:48:49 +0000 (13:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
70c2a7b0d9 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:47:47 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
70c2a7b0d9 -s ours
Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88
Bill Yi [Thu, 22 Jun 2017 13:47:15 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
4b209f21b6 -s ours
Change-Id: I438f9ea34f83513db4d43b7c6bc0f46c13d8d712
Evan Laird [Thu, 22 Jun 2017 13:44:31 +0000 (13:44 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev am:
6a651f81b5
am:
024ba89606
Change-Id: I330846d328be9e2e10631cd6ceb0296734308c23
Rob Carr [Thu, 22 Jun 2017 13:42:47 +0000 (13:42 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I45a7ed913929eeb8d1b6eda6855fe7976fa64a14
Bill Yi [Thu, 22 Jun 2017 13:39:36 +0000 (13:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: Ib192e1569074bcd19d38d8e67a8378f63ca99164
Evan Laird [Thu, 22 Jun 2017 13:39:34 +0000 (13:39 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
am:
ca35ed5cb9
Change-Id: I0d695cc7edaeddb7817a19ff6f7e33d55691d7e0
Bill Yi [Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
242c3c497c -s ours
Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6
TreeHugger Robot [Thu, 22 Jun 2017 13:31:40 +0000 (13:31 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
Erik Kline [Thu, 22 Jun 2017 09:35:45 +0000 (09:35 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
am:
e9b908c7a6 -s ours
Change-Id: Ie2f3c211b7e0807db4e5d5bfcd158356fca9a0dd
Erik Kline [Thu, 22 Jun 2017 09:31:03 +0000 (09:31 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
Erik Kline [Fri, 9 Jun 2017 07:36:29 +0000 (16:36 +0900)]
Only disable Wi-Fi IP serving on specific interface, if available
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: Id8d9c3f67f7a850af69069abee86adfc62841b28
Merged-In: Iac19359fd8712fa6a135f31bed9f0da97b3f2977
Merged-In: I99b170ebacc4135d1a09ce1ec3d43f76c6765de4
Change-Id: Ifd9131bad20810ee24c9436d8c0df7a81fae11d5
(cherry picked from commit
218c226b0882640a351deb0dd945a30b8bc32fff)
(cherry picked from commit
798a93b0df76c4feb5ddd619b788f2cf9ea5bf77)
Winson Chung [Thu, 22 Jun 2017 03:48:45 +0000 (03:48 +0000)]
Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev
am:
65a3b2ccc4
Change-Id: I576f611e4a1a6567e7cd2e80b4f5575ba99e2f4d
TreeHugger Robot [Thu, 22 Jun 2017 03:43:42 +0000 (03:43 +0000)]
Merge "Clean up dismiss target when last activity is unpinned." into oc-dr1-dev
Meng Wang [Thu, 22 Jun 2017 03:29:11 +0000 (03:29 +0000)]
Use "%s Wi-Fi" as WFC SPN for 302-{720,370}
am:
1b7ff89852
Change-Id: I3bf10404abc67b4f0284ee78cb4b63c1bd17cc5a
Winson Chung [Tue, 20 Jun 2017 00:01:51 +0000 (17:01 -0700)]
Clean up dismiss target when last activity is unpinned.
Bug:
37309693
Test: Enter PIP, drag to show dismiss target, force kill application and
ensure target is hidden.
Change-Id: Ia41f8252e32a2ff3396796562874a6c47777030d
Evan Laird [Wed, 21 Jun 2017 22:24:36 +0000 (18:24 -0400)]
Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev
Picked up a fudge factor along a the way because of the way that the
rounded edges of oc-dr1 change the imaginary bounds of the triangle.
This should look good though.
Test: visual; runtest systemui
Change-Id: Ie79025c74bfeb136bb7f5ee7fe5604b2c12ab71e
Meng Wang [Wed, 21 Jun 2017 22:09:29 +0000 (15:09 -0700)]
Use "%s Wi-Fi" as WFC SPN for 302-{720,370}
Bug:
62647106
Test: make
Change-Id: I109f4b78446f96a5cb10e0fc84935ad180c9146c
Matthew Fritze [Wed, 21 Jun 2017 21:51:49 +0000 (21:51 +0000)]
Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev
am:
736ba78a6e
Change-Id: I2b7421274bfd657575cc58ad6a0e35fd521e25d0
TreeHugger Robot [Wed, 21 Jun 2017 21:47:29 +0000 (21:47 +0000)]
Merge "Add enum to log psd bundle creation duration." into oc-dr1-dev
Pavel Grafov [Wed, 21 Jun 2017 21:24:47 +0000 (21:24 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: Ib3df83d82eb2646a0f657606e05225250b5db2e5
Pavel Grafov [Wed, 21 Jun 2017 21:18:31 +0000 (21:18 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
Rob Carr [Wed, 21 Jun 2017 21:08:31 +0000 (21:08 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I9ed40cbf0724627bcc89a2dd305ba61f206570e0
Rob Carr [Wed, 21 Jun 2017 21:01:42 +0000 (21:01 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
Bill Yi [Wed, 21 Jun 2017 20:25:08 +0000 (20:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: I219b010519c5efae20ca065ca29257a1f876fd7e
Bill Yi [Wed, 21 Jun 2017 20:19:33 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
d5a305068a -s ours
Change-Id: Ieac3186dbb446b1d08ca96618a96b1c1493553c6
TreeHugger Robot [Wed, 21 Jun 2017 20:17:35 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 21 Jun 2017 20:11:32 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 21 Jun 2017 20:08:35 +0000 (20:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
52653734e3 -s ours
Change-Id: I7bb9c57df7c7723d48bd12432567ee97ba9295d8
Bill Yi [Wed, 21 Jun 2017 19:56:07 +0000 (19:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
242c3c497c -s ours
Change-Id: Iaa7d2555bdcab5be052515f8f5d9c5c38360b4e9
TreeHugger Robot [Wed, 21 Jun 2017 19:51:45 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 21 Jun 2017 19:50:19 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Evan Laird [Wed, 21 Jun 2017 19:42:21 +0000 (19:42 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev
am:
6a651f81b5
Change-Id: Ie1fc63cf41efbe8006dad8ab80217f7d945b2de7
Evan Laird [Wed, 21 Jun 2017 19:31:22 +0000 (19:31 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev
Evan Laird [Tue, 20 Jun 2017 20:10:44 +0000 (16:10 -0400)]
Fix mobile signal icon when in airplane mode
1. Empty state was drawing a line too thing and not dark enough to be
seen.
2. Airplane mode should be the slashed, full signal, not the
empty one
Going into airplane mode now draws the full signal, lighter than normal,
with a slash. And the empty state now has a thicker line.
Test: runtest systemui
Fixes:
62794461
Change-Id: Ic5e40d2e0f6ebe0d270129f10883a1fcb146d717
Android Build Merger (Role) [Wed, 21 Jun 2017 19:17:50 +0000 (19:17 +0000)]
Merge "Merge "Fixed a bug where the panel could be stuck" into oc-dev am:
e8dceabd98 am:
3a18b28ab0" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 21 Jun 2017 19:16:32 +0000 (19:16 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev am:
e8dceabd98
am:
3a18b28ab0
Change-Id: I129f1939631a38b2aa51659e9ff4207404416398
Selim Cinek [Wed, 21 Jun 2017 19:14:34 +0000 (19:14 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev am:
e8dceabd98
am:
9dfc970b63
Change-Id: I00ea048b80625dfeda1ca532d4b7c90f3e57b96f
Android Build Merger (Role) [Wed, 21 Jun 2017 19:08:48 +0000 (19:08 +0000)]
Merge "Merge "Fixed a a11y regression to click notifications" into oc-dev am:
b792f98446 am:
0b9efc26f8" into oc-dr1-dev-plus-aosp
Selim Cinek [Wed, 21 Jun 2017 19:08:44 +0000 (19:08 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev
am:
e8dceabd98
Change-Id: I717e03ac52383494403aaaf886e970d86bb3f3e2
Selim Cinek [Wed, 21 Jun 2017 19:07:40 +0000 (19:07 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev am:
b792f98446
am:
0b9efc26f8
Change-Id: I405f984f12df8dbffa777eadaa35ec0917bd0972
Selim Cinek [Wed, 21 Jun 2017 19:07:12 +0000 (19:07 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev
am:
e8dceabd98
Change-Id: I8f6b3e2f853ff5a066de02ae0a006ebb4f157078
Selim Cinek [Wed, 21 Jun 2017 19:05:00 +0000 (19:05 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev am:
b792f98446
am:
1d50b00962
Change-Id: If8b429ac7c6c57fa756ae2d4e036beb2cf2ba919
Selim Cinek [Wed, 21 Jun 2017 19:00:10 +0000 (19:00 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev
am:
b792f98446
Change-Id: Idebc4fa9cb0b2512043b0aa817a96926ec0a0d2a
Selim Cinek [Wed, 21 Jun 2017 18:58:02 +0000 (18:58 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev
am:
b792f98446
Change-Id: I7d4a437367d40492effa95fcd0970389da7db592
TreeHugger Robot [Wed, 21 Jun 2017 18:57:42 +0000 (18:57 +0000)]
Merge "Fixed a bug where the panel could be stuck" into oc-dev
Selim Cinek [Wed, 21 Jun 2017 18:48:53 +0000 (18:48 +0000)]
Merge "Fixed a a11y regression to click notifications" into oc-dev
Mady Mellor [Wed, 21 Jun 2017 18:41:52 +0000 (18:41 +0000)]
Merge "Add customs accessibility actions to snooze, allow it to be focused" into oc-dr1-dev
am:
51278d6a27
Change-Id: I9c6e7a626cc7b51cee365bac1550051083534d3e
Michael Wright [Wed, 21 Jun 2017 18:37:03 +0000 (18:37 +0000)]
Merge "Make the log message in setInteractive a local variable." into oc-dr1-dev
am:
22ec7b0c46
Change-Id: I4106fe3fda23727fee6e10e2721cf707b44ce57d
Matthew Fritze [Mon, 12 Jun 2017 21:23:59 +0000 (14:23 -0700)]
Add enum to log psd bundle creation duration.
Bug:
62271803
Test: None. Enum change.
Change-Id: I46921e9330542e981f7983915127832096f6bcd2
TreeHugger Robot [Wed, 21 Jun 2017 18:31:28 +0000 (18:31 +0000)]
Merge "Add customs accessibility actions to snooze, allow it to be focused" into oc-dr1-dev
TreeHugger Robot [Wed, 21 Jun 2017 18:26:53 +0000 (18:26 +0000)]
Merge "Make the log message in setInteractive a local variable." into oc-dr1-dev
Svetoslav Ganov [Wed, 21 Jun 2017 17:38:27 +0000 (17:38 +0000)]
Merge "Support native shared libs" into oc-dr1-dev
am:
77dea6284a
Change-Id: I69205d02358b025ed00dc7141cb87fd692d0b883
Android Build Merger (Role) [Wed, 21 Jun 2017 17:34:28 +0000 (17:34 +0000)]
Merge "Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am:
9f1494368b am:
9a68e9b2ef" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 21 Jun 2017 17:30:59 +0000 (17:30 +0000)]
Merge "Support native shared libs" into oc-dr1-dev
Jean-Michel Trivi [Wed, 21 Jun 2017 17:30:54 +0000 (17:30 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am:
9f1494368b
am:
9a68e9b2ef
Change-Id: If166dfe2f0f087c349a488f0eb8bdfe462ae97b2
Jean-Michel Trivi [Wed, 21 Jun 2017 17:30:53 +0000 (17:30 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am:
9f1494368b
am:
34bc810b0b
Change-Id: I55c12d8767efa48ac596679e1c967a015d597a60
Jean-Michel Trivi [Wed, 21 Jun 2017 17:23:30 +0000 (17:23 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
am:
9f1494368b
Change-Id: Iaa671d4c7008609f0be7430b8f6c35f1021c7586
Jean-Michel Trivi [Wed, 21 Jun 2017 17:23:30 +0000 (17:23 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
am:
9f1494368b
Change-Id: Ic213b2675ee5571449c74b19184da7cb91331c01
Jean-Michel Trivi [Wed, 21 Jun 2017 17:15:31 +0000 (17:15 +0000)]
Merge "DnD: Total silence doesn't suppress A11y" into oc-dev
Bill Yi [Wed, 21 Jun 2017 16:53:11 +0000 (09:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ieea78949e86d21bf8be5b0ef974a74c53b6cd63c
Auto-generated-cl: translation import
Selim Cinek [Wed, 21 Jun 2017 16:44:52 +0000 (09:44 -0700)]
Fixed a bug where the panel could be stuck
Test: collapse the panels, let go, tap quickly, panel isn't stuck
Bug:
62602000
Change-Id: I449bcd4a6207c054eb5d536ba48ff8f05e26eb9a
Bill Yi [Wed, 21 Jun 2017 16:30:45 +0000 (09:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I14ab307f4d889f07fcac2dcd529a2bf684ad99f4
Auto-generated-cl: translation import
Selim Cinek [Wed, 21 Jun 2017 16:01:26 +0000 (09:01 -0700)]
Fixed a a11y regression to click notifications
Test: add notification, try clicking it on the lockscreen with talkback
Change-Id: I27dd75cab6bfdff3f534c31ebfb4df7a43129a6d
Fixes:
62767220
Svetoslav Ganov [Wed, 21 Jun 2017 02:35:51 +0000 (19:35 -0700)]
Support native shared libs
resolve merge conflict for
ac9b6706b
Add the shared libs that are APKs to the native library
path when creating application class loaders. Also don't
allow shared libraries hosting native libs to request
extraction of the native libs out of the APK. Lastly,
shared libraries hosting native libs must be declared
as multi-architecture.
Test: CTS tests in this topic
bug:
62720360
Change-Id: Ie3f203db12a3f3826e114c219a8341d9acab604f
Michael Wright [Tue, 20 Jun 2017 20:21:27 +0000 (21:21 +0100)]
Make the log message in setInteractive a local variable.
If the error message isn't a local variable, it will go out of scope
immediately after LogIfSlow is constructed. Unfortunately, LogIfSlow
maintains a pointer to String8s internal char* member... which causes a
use after free when it goes to log. Oops.
Bug:
62820330
Test: none
Change-Id: Ie1da3be723f8aae165822002ff42954480a43aa5
Erik Kline [Wed, 21 Jun 2017 13:29:48 +0000 (13:29 +0000)]
Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev
am:
592e85b4fd -s ours
Change-Id: I3bdfdb50557093b906a92ccebec2212274f9f255
TreeHugger Robot [Wed, 21 Jun 2017 13:22:54 +0000 (13:22 +0000)]
Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev
Paul Duffin [Wed, 21 Jun 2017 09:24:58 +0000 (09:24 +0000)]
Merge "Cleanup a.t.TestGrouping" am:
01dcf54e9a am:
e6ac3a4efc
am:
e2744c2705
Change-Id: I3493057c8362733f117dbc25f654497b9f22f219
Paul Duffin [Wed, 21 Jun 2017 09:18:01 +0000 (09:18 +0000)]
Merge "Cleanup a.t.TestGrouping" am:
01dcf54e9a
am:
e6ac3a4efc
Change-Id: Id41ba23de38e5131460cad283fd5d7bea66d2156
Paul Duffin [Wed, 21 Jun 2017 09:11:24 +0000 (09:11 +0000)]
Merge "Cleanup a.t.TestGrouping"
am:
01dcf54e9a
Change-Id: I58a278b7c45afe27309cf0029e9fb8fd452b22f2
Treehugger Robot [Wed, 21 Jun 2017 09:03:26 +0000 (09:03 +0000)]
Merge "Cleanup a.t.TestGrouping"
Chad Brubaker [Wed, 21 Jun 2017 08:35:11 +0000 (08:35 +0000)]
Merge "Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am:
88f98985d5" into oc-dev-plus-aosp
am:
b4da12905f
Change-Id: Ida50514aa15a056572fb401ebd4acc5b9e4c13fa
Paul Duffin [Wed, 21 Jun 2017 08:32:18 +0000 (08:32 +0000)]
Merge "Remove unused a.t.InstrumentationUtils" am:
0e4f1358d6 am:
08c12d21f5
am:
b4621a4072
Change-Id: I76b035a84dd184b2ff92fc175df383bc9983f616
Paul Duffin [Wed, 21 Jun 2017 08:29:30 +0000 (08:29 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner" am:
9d5576e081 am:
66b8ef6615
am:
4d7e8fb79e
Change-Id: I6d1de1dcb677e6c2c85c75fe8c5166b07cf713dd
Chad Brubaker [Wed, 21 Jun 2017 08:25:55 +0000 (08:25 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am:
88f98985d5
am:
53d87ebb55
Change-Id: Ie0877eefee8c61c95ffa16303d56c6a448933032
Android Build Merger (Role) [Wed, 21 Jun 2017 08:20:47 +0000 (08:20 +0000)]
Merge "Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am:
88f98985d5" into oc-dev-plus-aosp
Paul Duffin [Wed, 21 Jun 2017 08:20:29 +0000 (08:20 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder" am:
1935dce8eb am:
a4d2464189
am:
28600f2cae
Change-Id: I9004d50829d18736f6d50f6bd48cb6d7c3b6e605
Chad Brubaker [Wed, 21 Jun 2017 08:19:51 +0000 (08:19 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
am:
88f98985d5
Change-Id: Ifc85ffb37f139cd499fd2ebef4cfc6f6d9fcd932
Chad Brubaker [Wed, 21 Jun 2017 08:19:25 +0000 (08:19 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
am:
88f98985d5
Change-Id: Ifd33084351941d2fe58f6534014940a18d57528f
Paul Duffin [Wed, 21 Jun 2017 08:16:42 +0000 (08:16 +0000)]
Merge "Remove unused a.t.InstrumentationUtils" am:
0e4f1358d6
am:
08c12d21f5
Change-Id: I46ab06228623aa4e350b1285761e062e1d7393c0
TreeHugger Robot [Wed, 21 Jun 2017 08:14:06 +0000 (08:14 +0000)]
Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev
Paul Duffin [Wed, 21 Jun 2017 08:13:05 +0000 (08:13 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner" am:
9d5576e081
am:
66b8ef6615
Change-Id: I3ca3f23c2f8a741daf867aad08f57bac373e5d91
Paul Duffin [Wed, 21 Jun 2017 08:12:05 +0000 (08:12 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils" am:
3724e7e5e9 am:
e6e0601862
am:
f18dd720d3
Change-Id: I06d4ce8bf1b5ea985c5deda2e2d0fe5b1e7d79e5
Paul Duffin [Wed, 21 Jun 2017 08:07:14 +0000 (08:07 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder" am:
1935dce8eb
am:
a4d2464189
Change-Id: I88278d5cfd8fc3466cce39de3de54e34d67cbe0f
Paul Duffin [Wed, 21 Jun 2017 08:03:58 +0000 (08:03 +0000)]
Merge "Remove unused a.t.InstrumentationUtils"
am:
0e4f1358d6
Change-Id: Id4f1845ec46d9b79fbfbc8a7ca6f75279fef69f0
Paul Duffin [Wed, 21 Jun 2017 08:03:56 +0000 (08:03 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils" am:
3724e7e5e9
am:
e6e0601862
Change-Id: I2c5e4c7af30893d9183ee35326814fcb4506d0e8
Paul Duffin [Wed, 21 Jun 2017 08:00:45 +0000 (08:00 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner"
am:
9d5576e081
Change-Id: I376079be6f5e56adf51fec62ed3f89969029c0a1
Paul Duffin [Wed, 21 Jun 2017 07:57:54 +0000 (07:57 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder"
am:
1935dce8eb
Change-Id: If6e86d76bd8dfca6e91cc6eeda20cd1492980b1e
OSDN Git Service
