OSDN Git Service
Chad Brubaker [Fri, 28 Apr 2017 22:57:17 +0000 (22:57 +0000)]
Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev
am:
d2cc513e9f
Change-Id: I28d2e598a9599ded68f9682a058133fcb12eec9e
Dianne Hackborn [Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)]
Merge "Fix issue #
37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
am:
fb5840b0e6
Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892
TreeHugger Robot [Fri, 28 Apr 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev
Hall Liu [Fri, 28 Apr 2017 22:38:27 +0000 (22:38 +0000)]
Merge "eMBMS API update" am:
99b21ccb34 am:
6b4841d116
am:
cfb792830c
Change-Id: I4d227eeae02910f4be020b3e9abf3ec5decc168d
Dianne Hackborn [Fri, 28 Apr 2017 22:34:48 +0000 (22:34 +0000)]
Merge "Fix issue #
37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
Hall Liu [Fri, 28 Apr 2017 22:32:52 +0000 (22:32 +0000)]
Merge "eMBMS API update" am:
99b21ccb34
am:
6b4841d116
Change-Id: I54ea1661b0d7a341ea94c3a2348d1e6233fd0d80
Chad Brubaker [Fri, 28 Apr 2017 22:31:23 +0000 (22:31 +0000)]
Merge "Allow Instant Apps to read Settings defined by apps" into oc-dev
am:
5d80c9d5fe
Change-Id: I75ae6c210ccd1903d0bd4a814c231e0c570c6288
Hall Liu [Fri, 28 Apr 2017 22:25:53 +0000 (22:25 +0000)]
Merge "eMBMS API update"
am:
99b21ccb34
Change-Id: Ic459910f1a06979cf8e1813d18400236eeb1ad49
TreeHugger Robot [Fri, 28 Apr 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Allow Instant Apps to read Settings defined by apps" into oc-dev
Hall Liu [Fri, 28 Apr 2017 22:17:50 +0000 (22:17 +0000)]
Merge "eMBMS API update"
Android Build Merger (Role) [Fri, 28 Apr 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Merge "Bluetooth: bluetooth.le API fixes" am:
cf95973276 am:
6af9bde898 am:
62fc08f684" into oc-dev-plus-aosp
Jakub Pawlowski [Fri, 28 Apr 2017 22:06:06 +0000 (22:06 +0000)]
Merge "Bluetooth: bluetooth.le API fixes" am:
cf95973276 am:
6af9bde898
am:
62fc08f684
Change-Id: I7f8f4cb532afd05df48147068c4e51d1cba310d1
Jakub Pawlowski [Fri, 28 Apr 2017 22:02:52 +0000 (22:02 +0000)]
Merge "Bluetooth: bluetooth.le API fixes" am:
cf95973276 am:
6af9bde898
am:
62fc08f684
Change-Id: I98bf6fc7d8d58f102b1268cb3e6d27fb6fd86b78
Jakub Pawlowski [Fri, 28 Apr 2017 21:55:50 +0000 (21:55 +0000)]
Merge "Bluetooth: bluetooth.le API fixes" am:
cf95973276
am:
6af9bde898
Change-Id: I20d885ee7f12821885767a13cafac6c3dec4ba2d
Tomasz Wasilczyk [Fri, 28 Apr 2017 21:46:20 +0000 (21:46 +0000)]
Merge "Fix equality method implementation in BandConfig class." am:
30a34ec0e2 am:
5acbf70872
am:
3329b63b40
Change-Id: I45bf3234ccc66e5bcac071c0931846eed2e27f2b
Jakub Pawlowski [Fri, 28 Apr 2017 21:46:14 +0000 (21:46 +0000)]
Merge "Bluetooth: bluetooth.le API fixes"
am:
cf95973276
Change-Id: I67075df5e7d457cd85b40faefb3fe68946775330
fionaxu [Fri, 28 Apr 2017 21:40:00 +0000 (21:40 +0000)]
Merge "better defualt behaviour for msim" am:
fd810d8727 am:
6512f5eb10
am:
2113a60b56 -s ours
Change-Id: If1efb858a531eb1b6d88a151e3b1800605b8b778
Jakub Pawlowski [Fri, 28 Apr 2017 21:36:10 +0000 (21:36 +0000)]
Merge "Bluetooth: bluetooth.le API fixes"
Jakub Pawlowski [Fri, 28 Apr 2017 11:11:26 +0000 (04:11 -0700)]
Bluetooth: bluetooth.le API fixes
Fix minor spelling problems.
Throw IllegalStateException instead of IllegalArgumentException in
build().
Bug:
37532634
Test: none
Change-Id: I73b6f04aec98f5baffb06a363e2a3f71e8cec3c4
Sudheer Shanka [Fri, 28 Apr 2017 21:22:51 +0000 (21:22 +0000)]
Merge "Consider allow-in-power-save-except-idle whitelist while updating rules." into oc-dev
am:
5ee9a1dfa3
Change-Id: I463477157db84a7496e0659fbdd60c5ad4342989
Sudheer Shanka [Fri, 28 Apr 2017 21:08:28 +0000 (21:08 +0000)]
Merge "Consider allow-in-power-save-except-idle whitelist while updating rules." into oc-dev
Chris Warrington [Fri, 28 Apr 2017 20:44:19 +0000 (20:44 +0000)]
Merge "AAPT2: Error reporting through JNI." into oc-dev
am:
f49baef4b9
Change-Id: I7dab9ad1acb5cdfedd9f68d15f6a49c63e638aae
Dianne Hackborn [Fri, 28 Apr 2017 20:36:00 +0000 (13:36 -0700)]
Fix issue #
37324532: API Review: android.content.pm.InstrumentationInfo
targetProcess -> targetProcesses
Test: bit CtsAppTestCases:InstrumentationTest
Change-Id: I859985c689cc588c585cd0ec6e0a20411493a7c0
Felipe Leme [Fri, 28 Apr 2017 20:37:38 +0000 (20:37 +0000)]
Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev
am:
c21f723ca2
Change-Id: I275df43deb93de8b228484fe164e11227ab95311
Chris Warrington [Fri, 28 Apr 2017 20:36:57 +0000 (20:36 +0000)]
Merge "AAPT2: Error reporting through JNI." into oc-dev
Felipe Leme [Fri, 28 Apr 2017 20:29:45 +0000 (20:29 +0000)]
Merge "Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE." into oc-dev
Tomasz Wasilczyk [Fri, 28 Apr 2017 20:25:43 +0000 (20:25 +0000)]
Merge "Fix equality method implementation in BandConfig class." am:
30a34ec0e2
am:
5acbf70872
Change-Id: I57e6fa0f946f25048da1524f07fa4eb13fdb2f1c
Tomasz Wasilczyk [Fri, 28 Apr 2017 20:19:11 +0000 (20:19 +0000)]
Merge "Fix equality method implementation in BandConfig class."
am:
30a34ec0e2
Change-Id: I15d46cb69410efdc369d628f1681a880c1420d9d
Philip P. Moltmann [Fri, 28 Apr 2017 20:12:44 +0000 (20:12 +0000)]
Merge "Focus the SaveUi-Yes-Button by default" into oc-dev
am:
5bfeece239
Change-Id: If07dfcceafc5f2c6d1e6acbbb2d662ae80d0b2df
Tomasz Wasilczyk [Fri, 28 Apr 2017 20:09:03 +0000 (20:09 +0000)]
Merge "Fix equality method implementation in BandConfig class."
Andrew Sapperstein [Fri, 28 Apr 2017 20:06:21 +0000 (20:06 +0000)]
Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev
am:
2233ba3eb5
Change-Id: I578a447f88ee09da77f4974bce1a23e2c93ed40f
fionaxu [Fri, 28 Apr 2017 20:03:56 +0000 (20:03 +0000)]
Merge "better defualt behaviour for msim" am:
fd810d8727
am:
6512f5eb10
Change-Id: Iedf27158b48f606a1f24e8780f98c3399e3337c7
TreeHugger Robot [Fri, 28 Apr 2017 20:02:16 +0000 (20:02 +0000)]
Merge "Focus the SaveUi-Yes-Button by default" into oc-dev
Andrew Sapperstein [Fri, 28 Apr 2017 19:56:14 +0000 (19:56 +0000)]
Merge "Set Theme.DeviceDefault.Settings's colorEdgeEffect" into oc-dev
fionaxu [Fri, 28 Apr 2017 19:53:38 +0000 (19:53 +0000)]
Merge "better defualt behaviour for msim"
am:
fd810d8727
Change-Id: I242527153b768879acd1c105e69de5672678b006
Treehugger Robot [Fri, 28 Apr 2017 19:44:49 +0000 (19:44 +0000)]
Merge "better defualt behaviour for msim"
Tyler Gunn [Fri, 28 Apr 2017 19:32:55 +0000 (19:32 +0000)]
Merge "Add sort order extra for phoneaccount" am:
78d3f9e1f5 am:
bd4140a945
am:
9001d22999
Change-Id: I903198c9b488bc2571f4cfba8ffd25fe15b7260d
Chen Xu [Fri, 28 Apr 2017 19:30:43 +0000 (19:30 +0000)]
Merge "Updated javadocs for sendUssd APIs." am:
763ff42a69 am:
85f2654bb7
am:
88af063701 -s ours
Change-Id: Ib01f856091f65bd6af36c1f256cc06d749b28ea4
Chen Xu [Fri, 28 Apr 2017 19:21:19 +0000 (19:21 +0000)]
Merge "Update VVM API" am:
ac29d38623 am:
fe7e5970ac
am:
21ee1e2b54 -s ours
Change-Id: I2ba1d502edfeafbf94c84f0154e0ff05b90bf6ab
Chad Brubaker [Fri, 28 Apr 2017 19:01:17 +0000 (19:01 +0000)]
Merge "Allow system apps to define ephemeral permissions" into oc-dev
am:
0ddca92018
Change-Id: Ie68abfae227db1b5a62029671ab607ac38620ce3
Chris Craik [Fri, 28 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Add conic support for Path#approximate" into oc-dev
am:
ebd44d0076
Change-Id: I68f5924aef7526de1c801f529dd5a304a1a1d287
TreeHugger Robot [Fri, 28 Apr 2017 18:51:07 +0000 (18:51 +0000)]
Merge "Allow system apps to define ephemeral permissions" into oc-dev
Eric Laurent [Fri, 28 Apr 2017 18:51:10 +0000 (18:51 +0000)]
Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev
am:
d91cedb76d
Change-Id: I0d07b4cb37b9c35086e82bf06d55c99d47b267ad
TreeHugger Robot [Fri, 28 Apr 2017 18:47:31 +0000 (18:47 +0000)]
Merge "Add conic support for Path#approximate" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 18:43:37 +0000 (18:43 +0000)]
Merge "AudioService: fix missing AUDIO_BECOMING_NOISY intent" into oc-dev
Dianne Hackborn [Fri, 28 Apr 2017 18:42:20 +0000 (18:42 +0000)]
Merge "Fix issue #
37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
am:
9cd47a8ff2
Change-Id: I3b0c2cd18126792c6bd7e3894f8ff7753aecc078
Shane Brennan [Fri, 28 Apr 2017 18:33:03 +0000 (18:33 +0000)]
Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev
am:
8bfbb0af21
Change-Id: Iadb42396a450c70049544b967a3220db751158ed
Shane Brennan [Fri, 28 Apr 2017 18:22:22 +0000 (18:22 +0000)]
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
am:
7eec245c62
Change-Id: I5cb8c194e5f6b233720771db8fabb0b7eef3b0b0
Jeff Sharkey [Fri, 28 Apr 2017 18:20:11 +0000 (18:20 +0000)]
Merge "Change ClipData.addItem signature" into oc-dev
am:
5b26dac2c3
Change-Id: Iefe0521f3aaa7978e3805aae326b56c426885cef
Tyler Gunn [Fri, 28 Apr 2017 18:18:11 +0000 (18:18 +0000)]
Merge "Add sort order extra for phoneaccount" am:
78d3f9e1f5
am:
bd4140a945
Change-Id: I541d0bf6c370b952e0e725960187e55ecc9e9ac7
Selim Cinek [Fri, 28 Apr 2017 18:17:22 +0000 (18:17 +0000)]
Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
am:
7188fda4af
Change-Id: If501b5b534bee5b95f446fd48012c4c6a779bb10
Matthew Ng [Fri, 28 Apr 2017 18:15:17 +0000 (18:15 +0000)]
Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev
am:
ba836ad1fa
Change-Id: I34b0e717f5da0c029a8dd4d9571dc57291ec34c3
Chen Xu [Fri, 28 Apr 2017 18:12:21 +0000 (18:12 +0000)]
Merge "Updated javadocs for sendUssd APIs." am:
763ff42a69
am:
85f2654bb7
Change-Id: I5231b118c7cc0ce815b4e7f6c253a85c9d9fd929
Dianne Hackborn [Fri, 28 Apr 2017 18:10:35 +0000 (18:10 +0000)]
Merge "Fix issue #
37714224: API Review: ACTION_NEW_VIDEO" into oc-dev
Tyler Gunn [Fri, 28 Apr 2017 18:09:34 +0000 (18:09 +0000)]
Merge "Add sort order extra for phoneaccount"
am:
78d3f9e1f5
Change-Id: I7352b5c26122a2cda79687544d314c35c0a8d769
Chen Xu [Fri, 28 Apr 2017 18:04:42 +0000 (18:04 +0000)]
Merge "Update VVM API" am:
ac29d38623
am:
fe7e5970ac
Change-Id: I4f6ba7b3edd16cf63a6039b9da34db1a9c48cdec
Felipe Leme [Fri, 28 Apr 2017 17:50:20 +0000 (10:50 -0700)]
Changed EXTRA_DATA_EXTRAS to EXTRA_CLIENT_STATE.
Test: CtsAutoFillServiceTestCases pass
Fixes:
37775662
Change-Id: I85c016c3eb84a439371ac707f78b01d9882b75e9
Shane Brennan [Fri, 28 Apr 2017 18:02:39 +0000 (18:02 +0000)]
Merge "Updating docs for RemoteInput non-textual inputs per API review request." into oc-dev
Chad Brubaker [Fri, 28 Apr 2017 18:02:26 +0000 (11:02 -0700)]
Create Instant App cookie dir if it doesn't exist
Bug:
37778533
Test: run instant app in b/
37778533
Change-Id: I54ef62f6e5a290f3ccfa49ebde2a9d64a38de6a6
Andrew Scull [Fri, 28 Apr 2017 18:02:08 +0000 (18:02 +0000)]
Merge "Expand abbreviation in constant identifier." into oc-dev
am:
2c20a0f885
Change-Id: I2556528e6eed48196c622695c7d1e48043b5000e
Chad Brubaker [Fri, 28 Apr 2017 17:56:57 +0000 (10:56 -0700)]
Allow Instant Apps to read Settings defined by apps
This is a temporary solution, in the future we will investigate adding
an API that requires the app adding a setting to specify if the setting
should be visible to Instant Apps or not.
Test: run instant app from b/
37765840, see denials are gone.
Bug:
37765840
Change-Id: Ib256d375d2a07f743b360c61ed25c9857aafa36c
Tyler Gunn [Fri, 28 Apr 2017 17:58:43 +0000 (17:58 +0000)]
Merge "Add sort order extra for phoneaccount"
Chen Xu [Fri, 28 Apr 2017 17:57:29 +0000 (17:57 +0000)]
Merge "Updated javadocs for sendUssd APIs."
am:
763ff42a69
Change-Id: I9a7fd10b652bdbc43b3a171229815f99dfbf8e97
Shane Brennan [Fri, 28 Apr 2017 17:56:50 +0000 (17:56 +0000)]
Merge "Update comment to getDataOnlyRemoteInputs per API review." into oc-dev
Chen Xu [Fri, 28 Apr 2017 17:55:07 +0000 (17:55 +0000)]
Merge "Update VVM API"
am:
ac29d38623
Change-Id: Iec4b0f3cb89b49902aeeb7a044fbab0a98ba9e3e
Jeff Sharkey [Fri, 28 Apr 2017 17:53:09 +0000 (17:53 +0000)]
Merge "Change ClipData.addItem signature" into oc-dev
Srikanth Chintala [Mon, 27 Mar 2017 13:57:52 +0000 (19:27 +0530)]
Add sort order extra for phoneaccount
Add sort order extra for phoneaccount
which will be used while sorting
phone accounts in Telecomm
Test: Manual
Bug:
34872161
Merged-In: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Selim Cinek [Fri, 28 Apr 2017 17:48:55 +0000 (17:48 +0000)]
Merge "Fixes a bug where the asynctask wasn't removed when inflating" into oc-dev
Chris Wren [Fri, 28 Apr 2017 17:46:02 +0000 (17:46 +0000)]
Merge "expose the UID in the EventLog API" into oc-dev
am:
8ae5e04636
Change-Id: Id199e23d3024c9b137946e7802ee57e5e85281db
TreeHugger Robot [Fri, 28 Apr 2017 17:45:21 +0000 (17:45 +0000)]
Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev
fionaxu [Thu, 6 Apr 2017 17:31:48 +0000 (10:31 -0700)]
better defualt behaviour for msim
switch behaviour for the default case based on caller's context,
some API prefer defaultDataId while others prefer
defaultVoiceId/DefaultSmsId.
Bug:
36818721
Change-Id: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
Merged-in: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
Andrew Scull [Fri, 28 Apr 2017 17:41:48 +0000 (17:41 +0000)]
Merge "Expand abbreviation in constant identifier." into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:38:33 +0000 (17:38 +0000)]
Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
am:
4315c1e3d5
Change-Id: I8ec2d24a8b6bda9641bbb627e69521914240942f
TreeHugger Robot [Fri, 28 Apr 2017 17:28:01 +0000 (17:28 +0000)]
Merge "expose the UID in the EventLog API" into oc-dev
Jeff Sharkey [Fri, 28 Apr 2017 17:27:53 +0000 (17:27 +0000)]
Merge "Respond to API council feedback." into oc-dev
am:
77cc43e0d2
Change-Id: I0c2b86d34cfd2b2f5b94bc693657b40ecbd764fe
Chen Xu [Fri, 28 Apr 2017 17:26:11 +0000 (17:26 +0000)]
Merge "Updated javadocs for sendUssd APIs."
Chen Xu [Fri, 28 Apr 2017 17:25:53 +0000 (17:25 +0000)]
Merge "Update VVM API"
Chris Craik [Fri, 28 Apr 2017 17:23:24 +0000 (17:23 +0000)]
Merge "Make SurfaceTexture#isReleased public API" into oc-dev
am:
533538c96e
Change-Id: I03494906f51f88b3c650e3f0859bcac2148872e7
Evan Rosky [Fri, 28 Apr 2017 17:13:23 +0000 (17:13 +0000)]
Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev
am:
7666d6f967
Change-Id: Idc3a8f95bea47bad543d90e9ad18c606255e55ae
Jeff Sharkey [Fri, 28 Apr 2017 17:10:20 +0000 (17:10 +0000)]
Merge "@hide non-Handler variant of SM.openProxyFileDescriptor" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 17:10:12 +0000 (17:10 +0000)]
Merge "Respond to API council feedback." into oc-dev
Chris Craik [Fri, 28 Apr 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Make SurfaceTexture#isReleased public API" into oc-dev
Evan Rosky [Fri, 28 Apr 2017 17:05:40 +0000 (17:05 +0000)]
Merge "removeAllViews should also clean-up focusedInCluster" into oc-dev
Eric Laurent [Fri, 28 Apr 2017 01:31:22 +0000 (18:31 -0700)]
AudioService: fix missing AUDIO_BECOMING_NOISY intent
If Bluetooth service calls onBluetoothA2dpDeviceConfigChange() before
setBluetoothA2dpDeviceConnectionState(), there is a chance that the
first method fails leaving the A2DP device state disconnected in audio
policy manager while it appears as connected in AudioService causing a
failure to send the AUDIO_BECOMING_NOISY intent.
Bug:
37687852
Test: Verify AUDIO_BECOMING_NOISY intent is sent even if race
condition occurs.
Change-Id: I014d145e7da5e7d267991ffb2ff50626e71247eb
Felipe Leme [Fri, 28 Apr 2017 15:55:58 +0000 (15:55 +0000)]
Merge "Improved Autofill logging." into oc-dev
am:
2d5c0d89e5
Change-Id: I222ecf081d1d841350191fcfe36aa457fdbeb305
TreeHugger Robot [Fri, 28 Apr 2017 15:50:26 +0000 (15:50 +0000)]
Merge "Improved Autofill logging." into oc-dev
Tomasz Wasilczyk [Fri, 28 Apr 2017 15:19:34 +0000 (08:19 -0700)]
Fix equality method implementation in BandConfig class.
Test: instrumentation (in master branch)
Bug: b/
36863239
Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e
Chris Wren [Thu, 27 Apr 2017 20:56:54 +0000 (16:56 -0400)]
expose the UID in the EventLog API
Bug:
32806111
Test: runtest --path frameworks/base/core/tests/coretests/src/android/metrics
Change-Id: I16800a33bc6d4d37b3addd71b675fd760bd5d7b8
Martijn Coenen [Fri, 28 Apr 2017 15:10:39 +0000 (15:10 +0000)]
Merge "Validate incoming data properly." am:
5718b01b9a am:
4fcfe05707
am:
5aaf5543e4
Change-Id: I841e1f420a3e5f37839aa840fa7a88de6257772a
Julia Reynolds [Fri, 28 Apr 2017 14:54:41 +0000 (14:54 +0000)]
Merge "Default number badging off." into oc-dev
am:
076a255a76
Change-Id: I6c6b6f7107467009608f5695b4a374f1bdc4959b
Julia Reynolds [Fri, 28 Apr 2017 14:47:56 +0000 (14:47 +0000)]
Merge "Default number badging off." into oc-dev
Martijn Coenen [Fri, 28 Apr 2017 14:44:47 +0000 (14:44 +0000)]
Merge "Validate incoming data properly." am:
5718b01b9a
am:
4fcfe05707
Change-Id: I129a3e6c1b401448c075cd63c5396914bfb67fd7
Julia Reynolds [Thu, 27 Apr 2017 14:12:50 +0000 (10:12 -0400)]
Default number badging off.
Test: cts
Bug:
37737008
Change-Id: I5f73a648936d18c59c74334083b33e131395a681
Martijn Coenen [Fri, 28 Apr 2017 14:38:26 +0000 (14:38 +0000)]
Merge "Validate incoming data properly."
am:
5718b01b9a
Change-Id: I6b2badb1b075c1eb8d8e9d1e25397fc41ab1aae3
Jorim Jaggi [Fri, 28 Apr 2017 14:34:21 +0000 (14:34 +0000)]
Merge "Workaround an interpreter behavior to fix leak" into oc-dev
am:
745c6e02c6
Change-Id: I487fb7438edb7697a65e5abc695f32332f0567b1
Martijn Coenen [Fri, 28 Apr 2017 14:32:54 +0000 (14:32 +0000)]
Merge "Validate incoming data properly."
TreeHugger Robot [Fri, 28 Apr 2017 14:29:06 +0000 (14:29 +0000)]
Merge "Workaround an interpreter behavior to fix leak" into oc-dev
Pavel Grafov [Fri, 28 Apr 2017 14:23:42 +0000 (14:23 +0000)]
Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
am:
90357d62e9
Change-Id: I925165817781c3b0f4e37afe8ebcce1ac264d775
Pavel Grafov [Fri, 28 Apr 2017 14:15:53 +0000 (14:15 +0000)]
Merge "Introduce DISALLOW_BLUETOOTH_SHARING." into oc-dev
Kirill Grouchnikov [Fri, 28 Apr 2017 14:01:21 +0000 (14:01 +0000)]
Merge "Tweak initialization order of LinearLayout's dividers" into oc-dev
am:
b07544cf69
Change-Id: Icd96ecd6bc49c7c228a74e5322f79fc1ae4f42bc
OSDN Git Service
