OSDN Git Service
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
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
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: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
TreeHugger Robot [Wed, 21 Jun 2017 19:50:19 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
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
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
Paul Duffin [Wed, 21 Jun 2017 07:55:06 +0000 (07:55 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils"
am:
3724e7e5e9
Change-Id: Iebf38b15aaae0317935fe00e07d00cf806ab5942
Paul Duffin [Wed, 21 Jun 2017 07:46:41 +0000 (07:46 +0000)]
Merge "Remove unused a.t.InstrumentationUtils"
Paul Duffin [Wed, 21 Jun 2017 07:46:04 +0000 (07:46 +0000)]
Merge "Cleanup a.t.InstrumentationTestRunner"
Paul Duffin [Wed, 21 Jun 2017 07:46:02 +0000 (07:46 +0000)]
Merge "Remove unused a.t.s.InstrumentationTestSuiteBuilder"
Paul Duffin [Wed, 21 Jun 2017 07:46:00 +0000 (07:46 +0000)]
Merge "Remove unused android.test.DatabaseTestUtils"
Erik Kline [Thu, 9 Mar 2017 02:44:11 +0000 (11:44 +0900)]
Always allow Ethernet to be an upstream
If there are any upstream types defined at all, make sure that
either TYPE_ETHERNET is included somewhere within the sorted list
or force it to be at the front.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
36076442
Merged-In: I97737f4c12285f0bbeed0bd2efdfec6fbe95fd03
Merged-In: Id60706e623febcc35063ccb96c797fc4f9a223b1
Merged-In: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc
Change-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067
(cherry picked from commit
0e61baa0ac83e580429217f8394e1790d6510158)
Erik Kline [Wed, 21 Jun 2017 07:27:48 +0000 (07:27 +0000)]
Merge "Always allow Ethernet to be an upstream" am:
ecbe6fa147 am:
9cec380720
am:
cc6cd46d70
Change-Id: Id60706e623febcc35063ccb96c797fc4f9a223b1
Erik Kline [Wed, 21 Jun 2017 07:20:54 +0000 (07:20 +0000)]
Merge "Always allow Ethernet to be an upstream" am:
ecbe6fa147
am:
9cec380720
Change-Id: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc
Erik Kline [Wed, 21 Jun 2017 07:13:46 +0000 (07:13 +0000)]
Merge "Always allow Ethernet to be an upstream"
am:
ecbe6fa147
Change-Id: Ic9fd4bfd6ba7ecc00552019f804b87bc203ea98a
Treehugger Robot [Wed, 21 Jun 2017 07:06:47 +0000 (07:06 +0000)]
Merge "Always allow Ethernet to be an upstream"
Chad Brubaker [Wed, 21 Jun 2017 06:13:21 +0000 (23:13 -0700)]
Allow Instant Apps to call getPermissionControllerPackageName
This is needed for requesting permissions to work.
Bug:
62791664
Test: Requesting a runtime permission doesn't crash the app
Change-Id: If18ac8e4c903f3804ec24df39d169fa9145f449e
Erik Kline [Thu, 9 Mar 2017 02:44:11 +0000 (11:44 +0900)]
Always allow Ethernet to be an upstream
If there are any upstream types defined at all, make sure that
either TYPE_ETHERNET is included somewhere within the sorted list
or force it to be at the front.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
36076442
Change-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067
Yin-Chia Yeh [Wed, 21 Jun 2017 04:31:29 +0000 (04:31 +0000)]
Merge "Camera: remove capture session lock" into oc-dr1-dev
am:
104b68d0a5
Change-Id: Idf53e22c091914d504830e24e76c3936ef5e6257
Android Build Merger (Role) [Wed, 21 Jun 2017 04:22:55 +0000 (04:22 +0000)]
Merge changes from topic 'am-
608338568dd24535a5feb566bcc48cf7' into oc-dr1-dev-plus-aosp
* changes:
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev am:
4f7fd183eb am:
5fd9dd2e74
Fixed how FillEventHistory is reset and clarified javadoc. am:
2e30c6f371 am:
605f633995
TreeHugger Robot [Wed, 21 Jun 2017 04:21:29 +0000 (04:21 +0000)]
Merge "Camera: remove capture session lock" into oc-dr1-dev
Felipe Leme [Wed, 21 Jun 2017 04:20:33 +0000 (04:20 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev am:
4f7fd183eb
am:
a4d103d480
Change-Id: I99a244cfaa79a2c338a6c75ec1f12b9107420459
Felipe Leme [Wed, 21 Jun 2017 04:20:31 +0000 (04:20 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev am:
4f7fd183eb
am:
5fd9dd2e74
Change-Id: I6952bccb06d8a1e127662d5ff801d89c8d9a6153
Felipe Leme [Wed, 21 Jun 2017 04:18:34 +0000 (04:18 +0000)]
Fixed how FillEventHistory is reset and clarified javadoc. am:
2e30c6f371
am:
605f633995
Change-Id: I5218711a3cc5b9e1e92071e85208d1b189b810df
Felipe Leme [Wed, 21 Jun 2017 04:18:33 +0000 (04:18 +0000)]
Fixed how FillEventHistory is reset and clarified javadoc. am:
2e30c6f371
am:
9cd1c52867
Change-Id: Ida68112cd418e241b95ce3c65b37169b9098c053
Felipe Leme [Wed, 21 Jun 2017 04:02:27 +0000 (04:02 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am:
4f7fd183eb
Change-Id: Ibd7aebe46d1bb419ca33f8f38999fa9ab0d981ff
Felipe Leme [Wed, 21 Jun 2017 04:02:25 +0000 (04:02 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
am:
4f7fd183eb
Change-Id: Id26a5cdd53035eb94d4de3c0acf4378268b24c2e
Felipe Leme [Wed, 21 Jun 2017 04:00:28 +0000 (04:00 +0000)]
Fixed how FillEventHistory is reset and clarified javadoc.
am:
2e30c6f371
Change-Id: Ib4722f448f977e79d6d9dd8e3132db7167e91b03
Felipe Leme [Wed, 21 Jun 2017 04:00:27 +0000 (04:00 +0000)]
Fixed how FillEventHistory is reset and clarified javadoc.
am:
2e30c6f371
Change-Id: I55eb6f4a11e28ef2a8171c62848eb2b067f05ba1
TreeHugger Robot [Wed, 21 Jun 2017 03:45:42 +0000 (03:45 +0000)]
Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev
* changes:
Don't add FillEventHistory events to the wrong session.
Fixed how FillEventHistory is reset and clarified javadoc.
jackqdyulei [Wed, 21 Jun 2017 03:27:45 +0000 (03:27 +0000)]
Merge "Add metric for bluetooth pairing page" into oc-dr1-dev
am:
9e05514438
Change-Id: Idb289a01ad202a32503697d7c3c7270c8f4a2d55
TreeHugger Robot [Wed, 21 Jun 2017 03:16:31 +0000 (03:16 +0000)]
Merge "Add metric for bluetooth pairing page" into oc-dr1-dev
Kevin Chyn [Wed, 21 Jun 2017 03:02:07 +0000 (03:02 +0000)]
Merge "Add action for launching Assist Gesture settings" into oc-dr1-dev
am:
523c0a6a65
Change-Id: Id909368fc20963481ec7d1f19b2367d5e355dcdb
Android Build Merger (Role) [Wed, 21 Jun 2017 02:55:54 +0000 (02:55 +0000)]
Merge "Merge "Small doc fix." into oc-dev am:
0f98ddaa01 am:
e7de4716f0" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Wed, 21 Jun 2017 02:54:03 +0000 (02:54 +0000)]
Merge "Small doc fix." into oc-dev am:
0f98ddaa01
am:
e7de4716f0
Change-Id: If71d4bfae5c0544be23b6b1d582e0042b590c329
Android Build Merger (Role) [Wed, 21 Jun 2017 02:53:55 +0000 (02:53 +0000)]
Merge "Merge "Small doc fix." into oc-dev am:
0f98ddaa01 am:
e06356904f" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 21 Jun 2017 02:53:30 +0000 (02:53 +0000)]
Merge "Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev am:
70f1565b55 am:
2f666763e9" into oc-dr1-dev-plus-aosp
Dianne Hackborn [Wed, 21 Jun 2017 02:52:52 +0000 (02:52 +0000)]
Merge "Small doc fix." into oc-dev am:
0f98ddaa01
am:
e06356904f
Change-Id: I49e7d6174f812ee449435b91f0858040a261692c
Rob Carr [Wed, 21 Jun 2017 02:52:20 +0000 (02:52 +0000)]
Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev am:
70f1565b55
am:
2f666763e9
Change-Id: Idd8bcb8daad67f575d5988967af75a52fb6f11eb
TreeHugger Robot [Wed, 21 Jun 2017 02:52:00 +0000 (02:52 +0000)]
Merge "Add action for launching Assist Gesture settings" into oc-dr1-dev
Rob Carr [Wed, 21 Jun 2017 02:50:51 +0000 (02:50 +0000)]
Merge "SurfaceView: Fix positioning issue when toggling visibility." into oc-dev am:
70f1565b55
am:
bf78acda44
Change-Id: I98b615cd1f52385bb3cdbc4dcc287911f3eabad0
Android Build Merger (Role) [Wed, 21 Jun 2017 02:47:17 +0000 (02:47 +0000)]
Merge "Merge "[DO NOT MERGE] Support native shared libs" into oc-dev am:
324c41ba89 -s ours am:
2ff9a77549" into oc-dr1-dev-plus-aosp
Svetoslav Ganov [Wed, 21 Jun 2017 02:45:38 +0000 (02:45 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev am:
324c41ba89 -s ours
am:
2ff9a77549
Change-Id: Idc19693a864d0826df08ee5b5307142f370bca1c
Svetoslav Ganov [Wed, 21 Jun 2017 02:44:47 +0000 (02:44 +0000)]
Merge "[DO NOT MERGE] Support native shared libs" into oc-dev am:
324c41ba89
am:
d46d0386e2 -s ours
Change-Id: I8bbfe7d531797e9c93ce49aa0f41e925d7f041f9
Dianne Hackborn [Wed, 21 Jun 2017 02:42:23 +0000 (02:42 +0000)]
Merge "Small doc fix." into oc-dev
am:
0f98ddaa01
Change-Id: Iac5b780a9894ce3a5433d1c434286e01313e7f99
OSDN Git Service
