OSDN Git Service
Mihai Popa [Tue, 5 Jun 2018 12:10:43 +0000 (05:10 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev am:
bbfee3189d -s ours am:
b6c9be3ac2 -s ours
am:
a6f270d1e3 -s ours
Change-Id: Ibcb53315ed6415847ae1ef254933c5fee4420cc6
Jorim Jaggi [Tue, 5 Jun 2018 11:58:49 +0000 (04:58 -0700)]
Merge "Crashing can not override Keyguard transit" into pi-dev am:
44121059dc
am:
6d79f45783
Change-Id: I6d4daa349f03891fee1901fb5f5ff96096665f42
Mihai Popa [Tue, 5 Jun 2018 11:51:53 +0000 (04:51 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev am:
bbfee3189d -s ours
am:
b6c9be3ac2 -s ours
Change-Id: I3b7d566cd344ac2e3c8baf62bfee879e0fd9761c
Jorim Jaggi [Tue, 5 Jun 2018 11:46:46 +0000 (04:46 -0700)]
Merge "Crashing can not override Keyguard transit" into pi-dev
am:
44121059dc
Change-Id: Ieb020e920e1417d501f12bf7b5c2c57437685d9c
Mihai Popa [Tue, 5 Jun 2018 11:39:47 +0000 (04:39 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into pi-dev am:
0192e9a213
am:
32ea362e11 -s ours
Change-Id: Ib221a37ca6319a68c1a7fd0ed3d0be4e08dade7c
Mihai Popa [Tue, 5 Jun 2018 11:38:11 +0000 (04:38 -0700)]
[automerger skipped] Merge "Optimise the hit test algorithm" into oc-mr1-dev
am:
bbfee3189d -s ours
Change-Id: I46ea8080731ca5cd9690dff3e60953f1b2d7e930
Jorim Jaggi [Tue, 5 Jun 2018 11:32:55 +0000 (11:32 +0000)]
Merge "Crashing can not override Keyguard transit" into pi-dev
Mihai Popa [Tue, 5 Jun 2018 11:30:59 +0000 (04:30 -0700)]
Merge "Optimise the hit test algorithm" into pi-dev
am:
0192e9a213
Change-Id: I7c42beb5b63332748d05a7dd4fc7b0e50e5d8f08
TreeHugger Robot [Tue, 5 Jun 2018 11:28:11 +0000 (11:28 +0000)]
Merge "Optimise the hit test algorithm" into oc-mr1-dev
TreeHugger Robot [Tue, 5 Jun 2018 11:24:19 +0000 (11:24 +0000)]
Merge "Optimise the hit test algorithm" into pi-dev
Jorim Jaggi [Tue, 5 Jun 2018 11:15:16 +0000 (04:15 -0700)]
Merge "Defer stop for all activities becoming invisible" into pi-dev am:
318e52881e
am:
05424a176d
Change-Id: I3350563a36213ed590113191b41a9f284c4fdb31
Jorim Jaggi [Tue, 5 Jun 2018 11:07:52 +0000 (04:07 -0700)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
am:
318e52881e
Change-Id: I9ade540400f07e5a1ad099a5f945f06954060afd
Jorim Jaggi [Tue, 5 Jun 2018 10:55:38 +0000 (10:55 +0000)]
Merge "Defer stop for all activities becoming invisible" into pi-dev
Erik Kline [Tue, 5 Jun 2018 10:25:34 +0000 (03:25 -0700)]
Merge "Randomize the local Wifi IPv4 address" am:
13cb6084e2 am:
9c69afc86f
am:
f415a67fc0
Change-Id: I8f8397978a13c8b2303dfcd950700b447ea61d3c
Erik Kline [Tue, 5 Jun 2018 10:16:47 +0000 (03:16 -0700)]
Merge "Randomize the local Wifi IPv4 address" am:
13cb6084e2
am:
9c69afc86f
Change-Id: I47d75c32ccd4bcbbb2f05637fcbae216d7e15015
Erik Kline [Tue, 5 Jun 2018 10:08:53 +0000 (03:08 -0700)]
Merge "Randomize the local Wifi IPv4 address"
am:
13cb6084e2
Change-Id: I2aa4170c8f0b277d6c6e3489012c3698ab3d3229
Treehugger Robot [Tue, 5 Jun 2018 08:11:20 +0000 (08:11 +0000)]
Merge "Randomize the local Wifi IPv4 address"
Erik Kline [Tue, 29 May 2018 10:24:43 +0000 (19:24 +0900)]
Randomize the local Wifi IPv4 address
Also: address a few "error prone" warnings, adding @Override where missing
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes (with --no-hidden-api-checks)
- wifi tethering uses a randomized address, in as much as it can work
Bug:
32163131
Bug:
70673901
Change-Id: Icfabc48f2cf97b362ce292747f47021e84b900da
Bernie Innocenti [Tue, 5 Jun 2018 06:17:55 +0000 (23:17 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN" am:
4d3b5c1d3b am:
254f08bc70
am:
b1c9efc6fa
Change-Id: I1f9b78c8f828ec2df7aba71b39d62be0c4db2550
Bernie Innocenti [Tue, 5 Jun 2018 06:08:48 +0000 (23:08 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN" am:
4d3b5c1d3b
am:
254f08bc70
Change-Id: I8edeb0942e661c8385ff0cd3fdb72e6f62a8f218
Bernie Innocenti [Tue, 5 Jun 2018 05:53:58 +0000 (22:53 -0700)]
Merge "vpn: allow IPSec traffic through Always-on VPN"
am:
4d3b5c1d3b
Change-Id: I90fbe3ad3ec8b9d3b52e6036ae07dd8db814cb22
TreeHugger Robot [Tue, 5 Jun 2018 05:47:15 +0000 (05:47 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 5 Jun 2018 05:35:37 +0000 (05:35 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 5 Jun 2018 05:35:18 +0000 (05:35 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 5 Jun 2018 05:35:13 +0000 (05:35 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 5 Jun 2018 05:34:17 +0000 (05:34 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 5 Jun 2018 05:33:19 +0000 (05:33 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 5 Jun 2018 05:31:18 +0000 (05:31 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 5 Jun 2018 04:51:52 +0000 (04:51 +0000)]
Merge "Clear all fade-out timeouts"
Treehugger Robot [Tue, 5 Jun 2018 04:35:55 +0000 (04:35 +0000)]
Merge "vpn: allow IPSec traffic through Always-on VPN"
Yu Jia [Tue, 5 Jun 2018 02:52:48 +0000 (19:52 -0700)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed" am:
2dd3d8cbef am:
d490e788f1
am:
048c6751d7
Change-Id: I89d6290789324a38a28de5e03bd139e450297b23
Yu Jia [Tue, 5 Jun 2018 02:42:29 +0000 (19:42 -0700)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed" am:
2dd3d8cbef
am:
d490e788f1
Change-Id: I6e3507cfb5b6501dd28fb2b6019fdbb74fb745f0
Yu Jia [Tue, 5 Jun 2018 02:34:00 +0000 (19:34 -0700)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed"
am:
2dd3d8cbef
Change-Id: I37d35302041a8759eae91e616fa6f3d5c7fdf401
Makoto Onuki [Tue, 5 Jun 2018 02:21:01 +0000 (19:21 -0700)]
Merge "Allow except-idle whitelisted apps to start BG services in EBS" into pi-dev am:
205a5581ae
am:
5c6e5f189a
Change-Id: I3dc258afd597e892d50438f475878c971b1f3d55
Makoto Onuki [Tue, 5 Jun 2018 01:47:48 +0000 (18:47 -0700)]
Merge "Allow except-idle whitelisted apps to start BG services in EBS" into pi-dev
am:
205a5581ae
Change-Id: Ie5d327d5efa90946d92fe3a7063fec988fe56fcd
Makoto Onuki [Tue, 5 Jun 2018 01:46:13 +0000 (18:46 -0700)]
Merge "Ensure automatic battery saver won't stick" into pi-dev am:
c1203d6a96
am:
6e7625b0e2
Change-Id: I96ddca3b28561b2d6c52b35ca8bc1ff590cd9533
Andrew Sapperstein [Tue, 5 Jun 2018 01:37:39 +0000 (18:37 -0700)]
Merge "Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"" into pi-dev am:
0c6929ec04
am:
de8f091279
Change-Id: Ic55195e325096b049b0a4d0ae40649457cc6b0f5
Makoto Onuki [Tue, 5 Jun 2018 01:29:48 +0000 (01:29 +0000)]
Merge "Allow except-idle whitelisted apps to start BG services in EBS" into pi-dev
Ying Zheng [Tue, 5 Jun 2018 01:28:47 +0000 (18:28 -0700)]
Merge "Read build flag to determine user model." into pi-dev am:
9b5267f914
am:
bbb033e6e4
Change-Id: I10ce3a986863de596f136b7d59fc03f25a27d960
Treehugger Robot [Tue, 5 Jun 2018 01:15:16 +0000 (01:15 +0000)]
Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed"
Lucas Dupin [Tue, 5 Jun 2018 00:51:37 +0000 (17:51 -0700)]
Clear all fade-out timeouts
Change-Id: Id549d70836ca73ff7a079c41ac9793b64281bc84
Fixes:
80554360
Test: visual
Makoto Onuki [Tue, 5 Jun 2018 00:40:26 +0000 (17:40 -0700)]
Merge "Ensure automatic battery saver won't stick" into pi-dev
am:
c1203d6a96
Change-Id: I98897510188c38309f708d86802f83ef3573984d
Andrii Kulian [Tue, 5 Jun 2018 00:30:03 +0000 (17:30 -0700)]
Merge "Defer client visibility update when calculating new config" into pi-dev am:
f0e2c8bdde
am:
7cd50d3fff
Change-Id: Ia76b73690560c2c869e45e12969fb640d41d4926
Andrew Sapperstein [Tue, 5 Jun 2018 00:28:50 +0000 (17:28 -0700)]
Merge "Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"" into pi-dev
am:
0c6929ec04
Change-Id: I2f1c4b07946290e3adde90af82b6f7a2ec55f2b1
Ying Zheng [Tue, 5 Jun 2018 00:16:19 +0000 (17:16 -0700)]
Merge "Read build flag to determine user model." into pi-dev
am:
9b5267f914
Change-Id: I08c8e72fdbad7b20ac6039c441feabf2ac31205c
Fyodor Kupolov [Mon, 4 Jun 2018 23:51:53 +0000 (16:51 -0700)]
Merge "New behavior of setSynchronousMode" into pi-dev am:
492457e94e
am:
e953a1c5ab
Change-Id: I9bb84e2bafb1161fe85c7af05cf9fb4ae865e212
TreeHugger Robot [Mon, 4 Jun 2018 23:35:15 +0000 (23:35 +0000)]
Merge "Ensure automatic battery saver won't stick" into pi-dev
Hongming Jin [Mon, 4 Jun 2018 23:32:51 +0000 (16:32 -0700)]
Merge "Add shell command handler for account manager to allow enabling service binding for instant app. Test: cts-tradefed run cts -m CtsAccountManagerTestCases cts-instant-tradefed run cts-instant -m CtsAccountManagerTestCases Bug:
79367659" into pi-dev am:
64896541d4
am:
10fa41b542
Change-Id: I2ccad1d178aab981b0f4e47f8f332e7cc6057bb0
TreeHugger Robot [Mon, 4 Jun 2018 23:27:42 +0000 (23:27 +0000)]
Merge "Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"" into pi-dev
Jackal Guo [Mon, 4 Jun 2018 23:26:50 +0000 (16:26 -0700)]
Merge "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS" into pi-dev am:
15ebbeb9fd
am:
411e733a83
Change-Id: I1f12d9261b8c0f1f058f511129d98c6831f7a6c2
Ying Zheng [Mon, 4 Jun 2018 23:21:44 +0000 (23:21 +0000)]
Merge "Read build flag to determine user model." into pi-dev
Adrian Roos [Mon, 4 Jun 2018 23:13:12 +0000 (16:13 -0700)]
[automerger skipped] Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a am:
6281d64277 am:
668761b146 -s ours am:
60d179780f -s ours
am:
8a8c971209 -s ours
Change-Id: I4d12a035b8530d3269e39b965eaeef187bceea96
Ying Zheng [Fri, 1 Jun 2018 22:55:30 +0000 (15:55 -0700)]
Read build flag to determine user model.
Bug:
109698349
Test: Manual
Change-Id: I180b6a877ead576b0ed1292376fe0e74b0df1fd9
Lucas Dupin [Mon, 4 Jun 2018 22:51:48 +0000 (15:51 -0700)]
Merge "Blank screen when coming from pulse" into pi-dev am:
842ec5085b
am:
3d68a97d29
Change-Id: Ifac21906c44f76f2abcd29253fe85722ba6a4b82
Yin-Chia Yeh [Mon, 4 Jun 2018 22:46:48 +0000 (15:46 -0700)]
Merge "Camera: fix off by one error" into pi-dev am:
4003570f57
am:
55321dbd5d
Change-Id: Ie21a397348d8eef4f7be7b14a2aa9f214ddd6b61
Makoto Onuki [Mon, 4 Jun 2018 21:44:19 +0000 (14:44 -0700)]
Allow except-idle whitelisted apps to start BG services in EBS
Change-Id: I8dd42f48cf13c97b4e428afbf29838f442d8731b
Fixes:
80420676
Test: dumpsys activity processes| grep mDeviceIdle
mDeviceIdleWhitelist=[1000, 1001, 2000, 10028, 10035, 10036, 10042, 10053, 10137, 10138, 10139, 10142]
mDeviceIdleExceptIdleWhitelist=[1000, 1001, 2000, 10006, 10008, 10014, 10016, 10028, 10035, 10036, 10042, 10047, 10053, 10058, 10060, 10070, 10111, 10137, 10138, 10139, 10142]
Test: Manual test with "DEBUG_BACKGROUND_CHECK = true" and
am startservice 'com.android.vending/com.google.android.finsky.hygiene.DailyHygiene\$DailyHygieneService'
then check the whitelist log.
Andrii Kulian [Mon, 4 Jun 2018 22:08:47 +0000 (15:08 -0700)]
Merge "Defer client visibility update when calculating new config" into pi-dev
am:
f0e2c8bdde
Change-Id: I4c00d12154728287088bf946306ad78e805f2aec
Andrii Kulian [Mon, 4 Jun 2018 21:55:13 +0000 (21:55 +0000)]
Merge "Defer client visibility update when calculating new config" into pi-dev
Fyodor Kupolov [Mon, 4 Jun 2018 21:47:39 +0000 (14:47 -0700)]
Merge "New behavior of setSynchronousMode" into pi-dev
am:
492457e94e
Change-Id: I45c388d4386b443a48b6c94632c373dfe1aa8af3
TreeHugger Robot [Mon, 4 Jun 2018 21:30:17 +0000 (21:30 +0000)]
Merge "New behavior of setSynchronousMode" into pi-dev
Hongming Jin [Mon, 4 Jun 2018 21:19:06 +0000 (14:19 -0700)]
Merge "Add shell command handler for account manager to allow enabling service binding for instant app. Test: cts-tradefed run cts -m CtsAccountManagerTestCases cts-instant-tradefed run cts-instant -m CtsAccountManagerTestCases Bug:
79367659" into pi-dev
am:
64896541d4
Change-Id: I6221649f9035bcaa5dea4066b5a61c9dc8fdb06d
Jackal Guo [Mon, 4 Jun 2018 21:11:44 +0000 (14:11 -0700)]
Merge "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS" into pi-dev
am:
15ebbeb9fd
Change-Id: I6447f40dae907f63042024ac9558aa9ba6f6f4fd
Adrian Roos [Mon, 4 Jun 2018 21:06:29 +0000 (14:06 -0700)]
[automerger skipped] Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a am:
6281d64277 am:
668761b146 -s ours
am:
60d179780f -s ours
Change-Id: I42f926077f2aa80eafd18bfdbbea22dbcee634c2
Lucas Dupin [Mon, 4 Jun 2018 20:56:52 +0000 (13:56 -0700)]
Merge "Blank screen when coming from pulse" into pi-dev
am:
842ec5085b
Change-Id: Iac099da89693788cab0da36f5feecf66fd92ecef
Makoto Onuki [Mon, 4 Jun 2018 20:54:25 +0000 (13:54 -0700)]
Ensure automatic battery saver won't stick
Fixes:
80527470
Test: Manual tests:
Test 1: (make sure automatic BS won't stick)
- Set up automatic battery saver at N%
- Wait until the battery goes below N% -> Battery saver will turn on
- Turn off the device
- Charge it until the battery goes above N%
- Turn on the device
- Make sure battery saver is off.
Test 1: (make sure manual BS will stick)
- Make sure the battery level is above the automatic threshold
- Manually enable BS
- Reboot
- Make sure battery saver is on.
Change-Id: I677fd586f6b25d0200392941cac2d13b57fe10b3
Yin-Chia Yeh [Mon, 4 Jun 2018 20:51:59 +0000 (13:51 -0700)]
Merge "Camera: fix off by one error" into pi-dev
am:
4003570f57
Change-Id: Ide0f16e58ac2f83320cd8057ee243b9cce45edaa
Felipe Leme [Mon, 4 Jun 2018 20:43:50 +0000 (20:43 +0000)]
Merge "Document AutofillValue.forText() thread safety..."
Hongming Jin [Mon, 4 Jun 2018 20:38:46 +0000 (20:38 +0000)]
Merge "Add shell command handler for account manager to allow enabling service binding for instant app. Test: cts-tradefed run cts -m CtsAccountManagerTestCases cts-instant-tradefed run cts-instant -m CtsAccountManagerTestCases Bug:
79367659" into pi-dev
Andrew Sapperstein [Mon, 4 Jun 2018 20:33:58 +0000 (20:33 +0000)]
Revert "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS"
This reverts commit
44c4ca41d83d73d7c1d0e217a80a46a449e8c475.
Reason for revert: Wanted to go with a different option and this was mistakenly Dr. No'ed.
Bug:
80444486
Test: clean revert
Change-Id: I7fdd13a5bc0f4d9fabf91f3e5497c4065008b531
TreeHugger Robot [Mon, 4 Jun 2018 20:32:30 +0000 (20:32 +0000)]
Merge "Update checking of flag MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS" into pi-dev
Aurimas Liutikas [Mon, 4 Jun 2018 19:51:34 +0000 (19:51 +0000)]
Merge "Fix broken links in @see tags in framework docs."
Adrian Roos [Mon, 4 Jun 2018 19:49:11 +0000 (12:49 -0700)]
[automerger skipped] Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a am:
6281d64277
am:
668761b146 -s ours
Change-Id: Icf2ed114aa3c2bf500ea59c3f52ec75d0f73ff84
TreeHugger Robot [Mon, 4 Jun 2018 19:45:18 +0000 (19:45 +0000)]
Merge "Blank screen when coming from pulse" into pi-dev
TreeHugger Robot [Mon, 4 Jun 2018 19:34:19 +0000 (19:34 +0000)]
Merge "Camera: fix off by one error" into pi-dev
TreeHugger Robot [Mon, 4 Jun 2018 19:33:59 +0000 (19:33 +0000)]
Merge "Annotate Parcel param/return reference types."
Erik Kline [Mon, 4 Jun 2018 19:32:53 +0000 (12:32 -0700)]
[automerger skipped] Merge "Clear IPv4 address on tethering teardown." am:
86e94acfa4 am:
877328afa9 -s ours
am:
802ac98a01 -s ours
Change-Id: I892a3edc26d026846bdf80c82dc4f3e6f02e5f16
Erik Kline [Mon, 4 Jun 2018 19:23:28 +0000 (12:23 -0700)]
Merge "Send empty LinkProperties when entering StoppedState." am:
59ccf1041f am:
48b64fd9f2
am:
a5b35c7850
Change-Id: I01995b2b18154877792a2dffed0a19642264a758
Sundong Ahn [Mon, 4 Jun 2018 19:04:42 +0000 (12:04 -0700)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" am:
bd83ac0ecc am:
7295fd2af4
am:
9217ae6feb
Change-Id: Ie8774e8a5d9c4c0ab417a9294c1efd1a3ee6ade3
Erik Kline [Mon, 4 Jun 2018 18:59:48 +0000 (11:59 -0700)]
[automerger skipped] Merge "Clear IPv4 address on tethering teardown." am:
86e94acfa4
am:
877328afa9 -s ours
Change-Id: If86894bf2ee14217b9d58da99b90f0909ce59a10
David Brazdil [Mon, 4 Jun 2018 18:52:03 +0000 (11:52 -0700)]
Merge "Add another entry to hidden API light grey" into pi-dev am:
23621e7f02
am:
b4bee19f7b
Change-Id: I3e47ba6a015b08f799fa60cbaf984b881d804cd3
Erik Kline [Mon, 4 Jun 2018 18:49:28 +0000 (11:49 -0700)]
Merge "Send empty LinkProperties when entering StoppedState." am:
59ccf1041f
am:
48b64fd9f2
Change-Id: Ib946351005140d59e6a559610aa7448ab19c2630
Nicolas Geoffray [Mon, 4 Jun 2018 18:45:54 +0000 (11:45 -0700)]
Add more light grey APIs. am:
b4d26bdd4c
am:
29b11011e3
Change-Id: I524214b9b9d2eb273f1bd89079435c7782f65d28
Bill Yi [Mon, 4 Jun 2018 18:41:40 +0000 (11:41 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
dea740bdce -s ours
am:
0ea4fce1e2 -s ours
Change-Id: I532ee76dfbe8de92b07ff973efd0020ea0e3ede6
Bill Yi [Mon, 4 Jun 2018 18:39:56 +0000 (11:39 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
499ab31d92 -s ours
am:
728e5fbbaa -s ours
Change-Id: Ic797c9508c88686e9fde45aa9adca82c7d418f1e
Bill Yi [Mon, 4 Jun 2018 18:38:23 +0000 (11:38 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
eecbf8d318 -s ours
am:
8e94383948 -s ours
Change-Id: I284dc2837527a07ce0336494f4af9b05cf81b205
Bill Yi [Mon, 4 Jun 2018 18:35:38 +0000 (11:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
874fab7208 -s ours
am:
301bd85b5a -s ours
Change-Id: Ief851e4a44ff8d8afa2f86a766868cf59d489c40
Bill Yi [Mon, 4 Jun 2018 18:31:54 +0000 (11:31 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
aef1031ce6 -s ours
am:
8cadf6d2bf -s ours
Change-Id: I81f894d96ca46c26ae615e78c13c35004a70f712
Sundong Ahn [Mon, 4 Jun 2018 18:31:38 +0000 (11:31 -0700)]
Merge "com.android.media.tv.remoteprovider is built with java_sdk_library" am:
bd83ac0ecc
am:
7295fd2af4
Change-Id: Ib1964e9082209649f7e909bc075da1a61efc2af1
Bill Yi [Mon, 4 Jun 2018 18:24:57 +0000 (11:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
0edea4caec -s ours
am:
a0b096a28f -s ours
Change-Id: I299c70ab3193e0b3fb751f06a6dc58243bacaef1
Adrian Roos [Mon, 4 Jun 2018 18:18:38 +0000 (11:18 -0700)]
Merge "WM: Prevent secondary display focus while keyguard is up" into oc-dev am:
f04714c59a
am:
6281d64277
Change-Id: Ic7b12c406ac5aea0e9f40b5f2c2f72c5efd87212
David Brazdil [Mon, 4 Jun 2018 18:01:48 +0000 (11:01 -0700)]
Merge "Add another entry to hidden API light grey" into pi-dev
am:
23621e7f02
Change-Id: Ib4c4c5afc6451dfed012c7233d056aabd392fe7f
Nicolas Geoffray [Mon, 4 Jun 2018 17:54:50 +0000 (10:54 -0700)]
Add more light grey APIs.
am:
b4d26bdd4c
Change-Id: I40f4a8b5b1777b37cf2985f54516cfb7e89cf15f
Bill Yi [Mon, 4 Jun 2018 17:39:30 +0000 (10:39 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
dea740bdce -s ours
Change-Id: Ibe1c567b2ff2d32f4287aa9d2bf1d676520cfdd3
Bill Yi [Mon, 4 Jun 2018 17:37:50 +0000 (10:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
499ab31d92 -s ours
Change-Id: Ib34d094c16349d566a109cc8ec89607aaccdfacc
Erik Kline [Mon, 4 Jun 2018 17:36:28 +0000 (10:36 -0700)]
Merge "Clear IPv4 address on tethering teardown."
am:
86e94acfa4
Change-Id: Ibea385035880e971445b10d814d04c7419d3aaff
Bill Yi [Mon, 4 Jun 2018 17:35:19 +0000 (10:35 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
eecbf8d318 -s ours
Change-Id: I8ca084bda9030e414fb44c58b441ab23f62215ea
Bill Yi [Mon, 4 Jun 2018 17:32:27 +0000 (10:32 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
874fab7208 -s ours
Change-Id: I2640ed95dfa28b37365ed77d284c2ce547506b8e
Erik Kline [Mon, 4 Jun 2018 17:26:40 +0000 (10:26 -0700)]
Merge "Send empty LinkProperties when entering StoppedState."
am:
59ccf1041f
Change-Id: I0405006d15bc5d05d09202fa9dbc81989a9c0717
Bill Yi [Mon, 4 Jun 2018 17:26:27 +0000 (10:26 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
aef1031ce6 -s ours
Change-Id: I0409ab5ffae60156820044018b323b5385692aa6
TreeHugger Robot [Mon, 4 Jun 2018 17:22:28 +0000 (17:22 +0000)]
Merge "Wean statsd off batterystats: workchain, longPW"
OSDN Git Service
