OSDN Git Service
Julius D'souza [Fri, 26 May 2017 22:05:44 +0000 (22:05 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
am:
f4abac4d8f -s ours
Change-Id: I71478993576ea4d7fb58ceec7eb5a7bc63b425a0
Julius D'souza [Fri, 26 May 2017 22:00:41 +0000 (22:00 +0000)]
Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission.
am:
b9a71dfd38 -s ours
Change-Id: I9070e593929924f3feae92e08980549ba755036b
Julia Reynolds [Fri, 26 May 2017 21:52:17 +0000 (21:52 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev
am:
2c324042df
Change-Id: I8faa7ef43683d063cd13d54f3961d76621cff31c
TreeHugger Robot [Fri, 26 May 2017 21:48:48 +0000 (21:48 +0000)]
Merge "Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 21:43:24 +0000 (21:43 +0000)]
Merge "Properly read vibration setting on boot." into oc-dev
Felipe Leme [Fri, 26 May 2017 21:35:41 +0000 (21:35 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev
am:
3540463b74
Change-Id: I0a95d3c79a16240d00a8684341d00c9b76927fbf
TreeHugger Robot [Fri, 26 May 2017 21:29:41 +0000 (21:29 +0000)]
Merge "Disable autofill while user setup is not completed." into oc-dev
Amith Yamasani [Fri, 26 May 2017 21:10:40 +0000 (21:10 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
am:
22c2be0fbc
Change-Id: Ic92b2b189a02dec2929b972733a26d8caae1822d
Alan Viverette [Fri, 26 May 2017 21:03:07 +0000 (21:03 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev
am:
bd8fb0e71d
Change-Id: I8dbd50f99267fd86c8bde51a9428cb47bf701b21
TreeHugger Robot [Fri, 26 May 2017 20:56:05 +0000 (20:56 +0000)]
Merge "Use uptime instead of elapsed for measuring duration" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 20:54:49 +0000 (20:54 +0000)]
Merge "Resolve inflate attr against default package" into oc-dev
Jason Monk [Fri, 26 May 2017 20:52:10 +0000 (20:52 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev
am:
b25f52c042
Change-Id: I7ec755fdfda3014aecdcfa7ff47ae0c39d3bff92
Jason Monk [Fri, 26 May 2017 20:44:10 +0000 (20:44 +0000)]
Merge "Fix QS Detail header touch target" into oc-dev
Julia Reynolds [Fri, 26 May 2017 18:43:47 +0000 (14:43 -0400)]
Properly read vibration setting on boot.
Test: runtest systemui-notification
Change-Id: I400bc3df441524abe4973d4d6bccc7ef30a2e1c7
Fixes:
37865035
Selim Cinek [Fri, 26 May 2017 19:50:42 +0000 (19:50 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
am:
76926df97e
Change-Id: I7183050c98b5f1eb9f8a8a7dbfe4b7b75a1c3be7
Selim Cinek [Fri, 26 May 2017 19:45:00 +0000 (19:45 +0000)]
Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev
Jason Monk [Fri, 26 May 2017 19:08:22 +0000 (19:08 +0000)]
Merge "Make volume dialog pick up on theme changes" into oc-dev
am:
1ec5d85a41
Change-Id: I9b2e6dbe789bb6e1ff113e5ad015813e1062c6b4
Felipe Leme [Fri, 26 May 2017 19:06:25 +0000 (19:06 +0000)]
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
am:
7990306b8b
Change-Id: Id8d4957a142440c5e9b28bb2009f8299d8d3edf8
Jason Monk [Fri, 26 May 2017 19:03:39 +0000 (19:03 +0000)]
Merge "Make volume dialog pick up on theme changes" into oc-dev
Alan Viverette [Tue, 23 May 2017 15:33:42 +0000 (11:33 -0400)]
Resolve inflate attr against default package
Change-Id: I2de0f79fb4918770c9f816934b1fc4953073a4f1
Fixes:
38456890
Test: LayoutInflaterTest#testInclude
TreeHugger Robot [Fri, 26 May 2017 18:55:32 +0000 (18:55 +0000)]
Merge "Moar Autofill Framework javadoc improvements:" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:55:15 +0000 (18:55 +0000)]
Merge "Add ResourceId validation helper method" into oc-dev
am:
24c18af14a
Change-Id: I18dc41c220d3cd91c8ce78d93de860064c5f2294
Adam Lesinski [Fri, 26 May 2017 18:49:11 +0000 (18:49 +0000)]
Merge "AAPT2: Implement attribute compat versioning" into oc-dev
am:
e229113d46
Change-Id: I0200771f675cdfa69c458c374d3c16b0d91c5756
Adam Lesinski [Fri, 26 May 2017 18:45:24 +0000 (18:45 +0000)]
Merge "Add ResourceId validation helper method" into oc-dev
Adam Lesinski [Fri, 26 May 2017 18:42:43 +0000 (18:42 +0000)]
Merge "AAPT2: Implement attribute compat versioning" into oc-dev
Steven Moreland [Fri, 26 May 2017 18:38:09 +0000 (18:38 +0000)]
Merge "HIDL: C++ Java parity" into oc-dev
am:
579110398d -s ours
Change-Id: I60e19c0d9328bea5e69517e91b47a56e53758ad1
Steven Moreland [Fri, 26 May 2017 18:31:53 +0000 (18:31 +0000)]
Merge "HIDL: C++ Java parity" into oc-dev
Felipe Leme [Fri, 26 May 2017 16:24:33 +0000 (09:24 -0700)]
Disable autofill while user setup is not completed.
Test: manual verification with experimental app
Test: manual verification with Autofill with Google on flashed deviced
Test: existing CtsAutoFillServiceTestCases pass
Test: new LoginActivityTest.testSetupComplete pass
Fixes:
62049772
Change-Id: I1e914c44062755f8c88656482338e76aeaafd543
Jean-Michel Trivi [Fri, 26 May 2017 18:13:38 +0000 (18:13 +0000)]
Merge "Playback activity monitoring: add player types" into oc-dev
am:
faa2cdfa47
Change-Id: Ic22415e166e94e9a1d3301557b8fe36afce9d29f
TreeHugger Robot [Fri, 26 May 2017 18:06:16 +0000 (18:06 +0000)]
Merge "Playback activity monitoring: add player types" into oc-dev
Matt Sarett [Fri, 26 May 2017 18:01:31 +0000 (18:01 +0000)]
Merge "Add logging and null check for SkColorSpace serialization" into oc-dev
am:
d00e242ce7
Change-Id: I65de4174d6c058b10c23752f01b1da8164998cdc
Matt Sarett [Fri, 26 May 2017 17:54:09 +0000 (17:54 +0000)]
Merge "Add logging and null check for SkColorSpace serialization" into oc-dev
Jason Monk [Fri, 26 May 2017 17:19:38 +0000 (13:19 -0400)]
Fix QS Detail header touch target
Move around some spacings and paddings to make sure the whole area
counts as a touch for the header.
Test: manual
Change-Id: I3d7515767cc3624efb195481886dc03c69cc39c9
Fixes:
38250837
Jason Monk [Fri, 26 May 2017 14:38:54 +0000 (10:38 -0400)]
Make volume dialog pick up on theme changes
Test: change theme, view volume
Change-Id: I3f5b6ea7fd949e72624458a13b6c953629fcd1b5
Fixes:
38408033
Rebecca Silberstein [Fri, 26 May 2017 16:50:04 +0000 (16:50 +0000)]
Merge "WifiManager: add iface name and mode labels" am:
21cc4bcd01 am:
78deb691cc
am:
ca2cec4754 -s ours
Change-Id: I246ca7917e01ab70d8304a81c669d77c4641fa8d
Amith Yamasani [Fri, 26 May 2017 16:46:58 +0000 (09:46 -0700)]
Use uptime instead of elapsed for measuring duration
in time taken to read cpu stats.
This should avoid super long durations > 10 secs that are occasionally
seen in system logs.
Bug:
62104524
Test: manual
Change-Id: I9ed985a61125a207b6d4f6297091bd11b4c78616
Rebecca Silberstein [Fri, 26 May 2017 16:45:19 +0000 (16:45 +0000)]
Merge "WifiManager: add iface name and mode labels" am:
21cc4bcd01
am:
78deb691cc
Change-Id: Ie5364ed53119969bd8750a86cb3d5be244ed591d
Rebecca Silberstein [Fri, 26 May 2017 16:37:21 +0000 (16:37 +0000)]
Merge "WifiManager: add iface name and mode labels"
am:
21cc4bcd01
Change-Id: Ia715be047c0e1c3ef5ea5d38d013276cf5a3eacc
Yoshinori Hirano [Fri, 26 May 2017 16:31:00 +0000 (16:31 +0000)]
Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev
am:
dc23c5e809
Change-Id: Ib7611306c6117754759af2b07e21f9cd26610173
Julia Reynolds [Fri, 26 May 2017 16:28:37 +0000 (16:28 +0000)]
Merge "Send notification state event more frequently" into oc-dev
am:
13cbd65608
Change-Id: I1776c7a7f3a4e221efbb4abde723873802deddf5
Treehugger Robot [Fri, 26 May 2017 16:26:36 +0000 (16:26 +0000)]
Merge "WifiManager: add iface name and mode labels"
Tenghui Zhu [Fri, 26 May 2017 16:22:09 +0000 (16:22 +0000)]
Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
am:
36d6a985cd
Change-Id: I53422934c6bf84033fdfff94c5eda79275e91b3a
TreeHugger Robot [Fri, 26 May 2017 16:20:45 +0000 (16:20 +0000)]
Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 16:19:18 +0000 (16:19 +0000)]
Merge "Send notification state event more frequently" into oc-dev
Soonil Nagarkar [Fri, 26 May 2017 16:12:28 +0000 (16:12 +0000)]
Merge "Properly battery blame throttled location requests" into oc-dev
am:
68e341934b
Change-Id: Iad757080d2aafc738171e9b04d03581474a63142
Tenghui Zhu [Fri, 26 May 2017 16:10:19 +0000 (16:10 +0000)]
Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
Soonil Nagarkar [Fri, 26 May 2017 16:05:09 +0000 (16:05 +0000)]
Merge "Properly battery blame throttled location requests" into oc-dev
Matt Sarett [Fri, 26 May 2017 14:55:38 +0000 (10:55 -0400)]
Add logging and null check for SkColorSpace serialization
Test: Compiled and flashed device.
BUG:
38502480
Change-Id: Iaae74d8485ef88d85b634ddf86999e5cac60028f
Jason Monk [Fri, 26 May 2017 15:38:00 +0000 (15:38 +0000)]
Merge "Fix RTL for SignalDrawable" into oc-dev
am:
482da48066
Change-Id: I71d5e632bac18e5fad2a49321373e0ee01814678
TreeHugger Robot [Fri, 26 May 2017 15:30:18 +0000 (15:30 +0000)]
Merge "Fix RTL for SignalDrawable" into oc-dev
Felipe Leme [Fri, 26 May 2017 15:15:50 +0000 (15:15 +0000)]
Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
am:
25ae29dfd5
Change-Id: If14315daa807243828d0c386638fad38811d99e0
TreeHugger Robot [Fri, 26 May 2017 15:08:14 +0000 (15:08 +0000)]
Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
Mady Mellor [Fri, 26 May 2017 15:00:07 +0000 (15:00 +0000)]
Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev
am:
70739fb812
Change-Id: Ie2014ee92ec3fb629801b18465ec42c36b6e2283
Adrian Roos [Fri, 26 May 2017 14:57:30 +0000 (14:57 +0000)]
Merge "AOD: Fix AOD background bug" into oc-dev
am:
b8b748b7e6
Change-Id: I3026455c7460c24433d905fce63a4018a0c14271
Julia Reynolds [Fri, 26 May 2017 14:53:53 +0000 (14:53 +0000)]
Merge "Allow some system notifications to be blocked." into oc-dev
am:
3a2ac3e11b
Change-Id: I356dcf376002d95238509235389d260e179fea26
Mady Mellor [Fri, 26 May 2017 14:47:04 +0000 (14:47 +0000)]
Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev
am:
03a243889c
Change-Id: Iab86219c92978c4c37eaafd95800392d5b28bcf5
TreeHugger Robot [Fri, 26 May 2017 14:40:21 +0000 (14:40 +0000)]
Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 14:39:46 +0000 (14:39 +0000)]
Merge "AOD: Fix AOD background bug" into oc-dev
Julia Reynolds [Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)]
Merge "Allow some system notifications to be blocked." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 14:37:17 +0000 (14:37 +0000)]
Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev
Yoshinori Hirano [Fri, 14 Apr 2017 02:29:38 +0000 (11:29 +0900)]
Collapse QS panel forcibly after dismissing Keyguard
The Quick Settings panel is not collapsed when the screen lock is
unlocked by using TileService APIs (unlockAndRun() and
startActivityAndCollapse()).
To fix this issue, the QS panel should be collapsed forcibly when
startActivityAndCollapse() is called.
Bug:
38252721
Test: manual - install an app which calls startActivityAndCollapse()
inside the runnable passed to unlockAndRun().
Author: Yuta Yamada <yuta.x.yamada@sonymobile.com>
Change-Id: I82d1df368d5024283f58ee5cc2d42559aac28467
Jason Monk [Thu, 25 May 2017 20:11:52 +0000 (16:11 -0400)]
Fix RTL for SignalDrawable
Test: visual
Change-Id: I685125dff96829159d78983ad4b7c7f91d095c5c
Fixes:
38487767
Tony Mak [Fri, 26 May 2017 13:06:23 +0000 (13:06 +0000)]
Merge "Remove the old version of setAffiliationIds" into oc-dev
am:
8d902a9e28
Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6
TreeHugger Robot [Fri, 26 May 2017 13:00:35 +0000 (13:00 +0000)]
Merge "Remove the old version of setAffiliationIds" into oc-dev
Erik Kline [Fri, 26 May 2017 10:29:13 +0000 (10:29 +0000)]
Merge "Support registration of offload control callbacks." am:
7ee96625c2 am:
66cc06c2c7
am:
96c6d201f4
Change-Id: Ie3c4b0929ccf311b4f02fffe0908571cbbb7d772
Erik Kline [Fri, 26 May 2017 10:22:33 +0000 (10:22 +0000)]
Merge "Support registration of offload control callbacks." am:
7ee96625c2
am:
66cc06c2c7
Change-Id: Ieab0ae324ccf8ddfea02adfe647407df6c12b945
Nicolas Geoffray [Fri, 26 May 2017 10:17:05 +0000 (10:17 +0000)]
Merge "resolve merge conflicts of
255b69aca02f to oc-dev-plus-aosp" into oc-dev-plus-aosp
Rebecca Silberstein [Thu, 25 May 2017 08:53:08 +0000 (01:53 -0700)]
WifiManager: add iface name and mode labels
Connectivity service needs to get the interface name and intended ip
configuration mode for softap.
This CL adds the interface name and softap target mode variables to
use to insert the extra info into the wifi ap state change broadcast.
Note: additional CLs are needed to verify the iface name and mode. The
mode tracking is still in progress.
Bug:
62076211
Test: frameworks/base/wifi/tests/runtests.sh
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: manually verified the name in the broadcast
Merged-In: I67f82525b5c0fa5b81235311988c9b186d16077a
Merged-In: Ieff7af7c1ac2113b8044c16a01cad0f96cb70158
Change-Id: I64e1d13a9e422945fe9c4c268c206da365d0a3eb
(cherry picked from commit
4ac2cab8fd8cb6ef877f4e5c37f554f1a09b79dc)
Erik Kline [Fri, 26 May 2017 10:16:26 +0000 (10:16 +0000)]
Merge "Support registration of offload control callbacks."
am:
7ee96625c2
Change-Id: Ica4f51762b577e3868e87622df3963cd89daacae
Treehugger Robot [Fri, 26 May 2017 10:07:25 +0000 (10:07 +0000)]
Merge "Support registration of offload control callbacks."
Nicolas Geoffray [Fri, 26 May 2017 08:47:18 +0000 (09:47 +0100)]
resolve merge conflicts of
255b69aca02f to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9caf7542f11b0b322da063a5a08140384eba0ce0
Erik Kline [Fri, 26 May 2017 09:55:29 +0000 (09:55 +0000)]
Merge "WifiManager: add iface name and mode labels" into oc-dev
am:
dfd185c62f
Change-Id: I67f82525b5c0fa5b81235311988c9b186d16077a
Erik Kline [Fri, 26 May 2017 09:49:20 +0000 (09:49 +0000)]
Merge "WifiManager: add iface name and mode labels" into oc-dev
Nicolas Geoffray [Fri, 26 May 2017 08:13:49 +0000 (08:13 +0000)]
Merge "Pass bootComplete to dexopt." am:
18c3201986
am:
1e35b7b5bc
Change-Id: Id4633d3729c8532d901b33bb6720d8f34df1e6e9
Nicolas Geoffray [Fri, 26 May 2017 08:07:58 +0000 (08:07 +0000)]
Merge "Pass bootComplete to dexopt."
am:
18c3201986
Change-Id: I5d73692a887ef8f3fff888c310f9969d79ada970
Nicolas Geoffray [Fri, 26 May 2017 08:00:40 +0000 (08:00 +0000)]
Merge "Pass bootComplete to dexopt."
Erik Kline [Tue, 25 Apr 2017 10:19:59 +0000 (19:19 +0900)]
Support registration of offload control callbacks.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: I054cdf6a277c77e4cbf5c81145446a9be1c5fe39
Sundeep Ghuman [Fri, 26 May 2017 02:53:59 +0000 (02:53 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev
am:
04b5a63006
Change-Id: I3827885f89229f3063dd96ecaab9400e4579350b
Jean-Michel Trivi [Thu, 25 May 2017 22:11:07 +0000 (15:11 -0700)]
Playback activity monitoring: add player types
Add player types for playback activity monitoring:
- AAudio
- hardware sources
- proxy for external players
Fix some declarations that do not follow coding guidelines
Test: n/a
Bug:
62027849
Change-Id: I14088a071a296fa8d342b36b550f1dc4e3388653
TreeHugger Robot [Fri, 26 May 2017 02:47:51 +0000 (02:47 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev
Dianne Hackborn [Fri, 26 May 2017 01:39:51 +0000 (01:39 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev
am:
e2975af2d3
Change-Id: I431753261cfab677935a65548d235585c19ed565
Makoto Onuki [Fri, 26 May 2017 01:37:50 +0000 (01:37 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
am:
58f6f428fc
Change-Id: I108e9cc771457bb537d2857cde8f96607dbb0a8f
Ian Lake [Fri, 26 May 2017 01:31:10 +0000 (01:31 +0000)]
Merge "Relayout when base inner insets change" into oc-dev
am:
7f874db5aa
Change-Id: I91bc90559f462d622133a018b1217eae10b6e11b
Adam Powell [Fri, 26 May 2017 01:28:41 +0000 (01:28 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
am:
05d64e8b72
Change-Id: I3cbf8fbdc9a54f1d47c1ab4c86eaf3f1850f468f
Suprabh Shukla [Fri, 26 May 2017 01:17:50 +0000 (01:17 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev
am:
db6caa5841
Change-Id: I00ea2d375c9543f26d0489939183b612942b1b46
TreeHugger Robot [Fri, 26 May 2017 01:12:13 +0000 (01:12 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev
Jeff Sharkey [Fri, 26 May 2017 01:09:53 +0000 (01:09 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev
am:
a6b7e0a679
Change-Id: I1610373c91aa4fc2a60732c51145b585b6372729
Bryce Lee [Fri, 26 May 2017 01:05:20 +0000 (01:05 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev
am:
aa051df3b6
Change-Id: I4a8e9eb6452a40acdb0e9fc3a6a6db4908062b8b
Android Build Merger (Role) [Fri, 26 May 2017 01:02:21 +0000 (01:02 +0000)]
Merge changes from topic 'am-
d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'multinetwork_vndk' into oc-dev am:
cffee96a16
Move libandroid_net from Android.mk to Android.bp. am:
addb296226 -s ours
Lorenzo Colitti [Fri, 26 May 2017 01:01:21 +0000 (01:01 +0000)]
Merge changes from topic 'multinetwork_vndk' into oc-dev
am:
cffee96a16
Change-Id: I91cac262cdb6af6e441c4750636ec28a97f2ad1a
Lorenzo Colitti [Fri, 26 May 2017 00:59:52 +0000 (00:59 +0000)]
Move libandroid_net from Android.mk to Android.bp.
am:
addb296226 -s ours
Change-Id: Ie5c94188dfe3ea99a0ef3747c8b359c32e6176f0
Hugo Benichi [Fri, 26 May 2017 00:58:27 +0000 (00:58 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b am:
41a57af66a
am:
ae278410f5
Change-Id: I4fa34b647e7b2408d4493cfb148ae7d8c24bd6e8
Hugo Benichi [Fri, 26 May 2017 00:51:23 +0000 (00:51 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b
am:
41a57af66a
Change-Id: Ieea1398319d8235e823464239d233bf6f528126d
TreeHugger Robot [Fri, 26 May 2017 00:45:38 +0000 (00:45 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
Sundeep Ghuman [Thu, 11 May 2017 00:45:13 +0000 (17:45 -0700)]
Add extra debug logging to WifiTracker.
Bug: b/
38212080
Test: NA
Change-Id: I1f5d1a1d43a1dd4d9ce2235d3a53d043d4e2120d
Hugo Benichi [Fri, 26 May 2017 00:43:06 +0000 (00:43 +0000)]
Merge changes If4deb106,Ib25d7658
am:
0388f0e47b
Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3
Hugo Benichi [Fri, 26 May 2017 00:34:03 +0000 (00:34 +0000)]
Merge changes If4deb106,Ib25d7658
* changes:
NsdService: do not use ContentResolver directly
@Ignore ConnectivityServiceTest#testRequestBenchmark
TreeHugger Robot [Thu, 25 May 2017 23:25:43 +0000 (23:25 +0000)]
Merge "Relayout when base inner insets change" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:19:51 +0000 (23:19 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev
OSDN Git Service
