OSDN Git Service
Ta-wei Yen [Wed, 13 Dec 2017 22:29:36 +0000 (22:29 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am:
8244ebfc4e am:
a02bbdb8d8
am:
3d89874bb5
Change-Id: I6b1882e006a7b708c5979b4970a2ddc9be35f93b
Ta-wei Yen [Wed, 13 Dec 2017 22:17:45 +0000 (22:17 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am:
8244ebfc4e
am:
a02bbdb8d8
Change-Id: Ife2c39388ab647b0e4f5677d920da780b6eb39ca
Android Build Merger (Role) [Wed, 13 Dec 2017 22:13:03 +0000 (22:13 +0000)]
Merge "Merge "Add reference counted resources to IpSecService" am:
e11366f38a am:
adb6437fea am:
012739e9ad"
Benedict Wong [Wed, 13 Dec 2017 22:11:20 +0000 (22:11 +0000)]
Merge "Add reference counted resources to IpSecService" am:
e11366f38a am:
adb6437fea
am:
012739e9ad
Change-Id: Iae17a5d33d71e8abf24211cbf2b215520f45c619
TreeHugger Robot [Wed, 13 Dec 2017 22:09:55 +0000 (22:09 +0000)]
Merge "Add OWNERS for dreams"
Ta-wei Yen [Wed, 13 Dec 2017 22:07:17 +0000 (22:07 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
am:
8244ebfc4e
Change-Id: Iea3c38056e17abc09af7f7d933cbb9627575d8ee
Benedict Wong [Wed, 13 Dec 2017 22:00:26 +0000 (22:00 +0000)]
Merge "Add reference counted resources to IpSecService" am:
e11366f38a
am:
adb6437fea
Change-Id: I927ac534570b3836510e0fb4feda8cf544f5a9e4
Treehugger Robot [Wed, 13 Dec 2017 21:56:12 +0000 (21:56 +0000)]
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled"
Benedict Wong [Wed, 13 Dec 2017 21:50:19 +0000 (21:50 +0000)]
Merge "Add reference counted resources to IpSecService"
am:
e11366f38a
Change-Id: If218f4c241199e22e3295a5bcb049980d7949f4e
TreeHugger Robot [Wed, 13 Dec 2017 21:45:11 +0000 (21:45 +0000)]
Merge "Bug fix for device idle mode light"
TreeHugger Robot [Wed, 13 Dec 2017 21:38:14 +0000 (21:38 +0000)]
Merge "Fix deadlock when fetching active voice interaction service component."
Benedict Wong [Wed, 13 Dec 2017 21:33:38 +0000 (21:33 +0000)]
Merge "Add reference counted resources to IpSecService"
TreeHugger Robot [Wed, 13 Dec 2017 21:12:32 +0000 (21:12 +0000)]
Merge "Make DevicePolicyManager.isAffiliatedUser public"
Colin Cross [Wed, 13 Dec 2017 20:55:23 +0000 (20:55 +0000)]
Merge "Make services.core the final priorityboosted jar" am:
a0c1780d3c am:
93de069ec9
am:
ff6fcaec0b
Change-Id: I6ba33f829ed72ee799b4855021ba1f136ea49bd4
TreeHugger Robot [Wed, 13 Dec 2017 20:50:13 +0000 (20:50 +0000)]
Merge "SkPixelSerialize is deprecated (and unneeded in this case)"
Colin Cross [Wed, 13 Dec 2017 20:43:20 +0000 (20:43 +0000)]
Merge "Make services.core the final priorityboosted jar" am:
a0c1780d3c
am:
93de069ec9
Change-Id: Ib1a626060f2e2d617ca0b51e016cc7e06cae27d8
Colin Cross [Wed, 13 Dec 2017 20:33:28 +0000 (20:33 +0000)]
Merge "Make services.core the final priorityboosted jar"
am:
a0c1780d3c
Change-Id: I4969cd15085ab460a112547e63362bf8c2bc1602
Dan Albert [Wed, 13 Dec 2017 20:18:57 +0000 (20:18 +0000)]
Merge "Include what we use." am:
b0efcc1f68 am:
afa15b0846
am:
83a1241e5a
Change-Id: I829bad9fe74620b40599eeba745743679e04eba6
Colin Cross [Wed, 13 Dec 2017 20:16:19 +0000 (20:16 +0000)]
Merge "Make services.core the final priorityboosted jar"
Sanket Padawe [Wed, 13 Dec 2017 20:15:10 +0000 (20:15 +0000)]
Merge "Receiving side Call handover API implementation."
Luke Song [Wed, 13 Dec 2017 20:11:50 +0000 (20:11 +0000)]
Merge "Separate volume ui and safety warning configs"
Dan Albert [Wed, 13 Dec 2017 20:07:04 +0000 (20:07 +0000)]
Merge "Include what we use." am:
b0efcc1f68
am:
afa15b0846
Change-Id: I1f4ba5196d1118cfcd68821fa8ac0fbd17d8b5fc
TreeHugger Robot [Wed, 13 Dec 2017 20:02:54 +0000 (20:02 +0000)]
Merge "Improvements to loadtest app."
Dan Albert [Wed, 13 Dec 2017 19:52:11 +0000 (19:52 +0000)]
Merge "Include what we use."
am:
b0efcc1f68
Change-Id: Ic75bda75c80be19ee7f0f865ffd9e4f8c70fe785
Treehugger Robot [Wed, 13 Dec 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Include what we use."
TreeHugger Robot [Wed, 13 Dec 2017 19:19:53 +0000 (19:19 +0000)]
Merge "Add an API for setting a new brightness curve."
Winson Chung [Wed, 13 Dec 2017 19:08:39 +0000 (11:08 -0800)]
Fix deadlock when fetching active voice interaction service component.
- Notify AM whenever the active voice interaction service changes and
dependency on VoiceInteractionManagerService from AM.
Bug:
70616466
Test: android.server.am.ActivityManagerAssistantStackTests
Change-Id: Ifd3dcbf0b6afc7b3e8a1d9d29bacd5b04af2a15d
TreeHugger Robot [Wed, 13 Dec 2017 19:03:04 +0000 (19:03 +0000)]
Merge "Enable init.rc for statsd to start statsd by default in boot time"
Android Build Merger (Role) [Wed, 13 Dec 2017 18:53:48 +0000 (18:53 +0000)]
Merge "Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217 am:
c1ad3c5f29 am:
7818322b62 -s ours"
Dmitry Shmidt [Wed, 13 Dec 2017 18:52:01 +0000 (18:52 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217 am:
c1ad3c5f29
am:
7818322b62 -s ours
Change-Id: Ifbc3e4db63fb618574dcd74993414f75e683372f
TreeHugger Robot [Wed, 13 Dec 2017 18:51:07 +0000 (18:51 +0000)]
Merge "Fix identation for switch statement."
Mike Reed [Wed, 13 Dec 2017 18:43:16 +0000 (13:43 -0500)]
SkPixelSerialize is deprecated (and unneeded in this case)
Test: make
Change-Id: Icc421586de82a516cb5e32b60949315d1108a9a3
Luke Song [Tue, 12 Dec 2017 20:27:08 +0000 (12:27 -0800)]
Separate volume ui and safety warning configs
VR headsets want to prevent 2d volume ui from being displayed, but want
to keep the high volume warning dialog.
Bug:
67951608
Bug:
68997348
Test: Tested linearly independent configs
Change-Id: Ic102ce626e199d2e3a3cf8fbb091050977c696bb
Jordan Liu [Wed, 13 Dec 2017 18:20:12 +0000 (18:20 +0000)]
Merge "Unhide signal strength carrier config"
Dmitry Shmidt [Wed, 13 Dec 2017 18:16:43 +0000 (18:16 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs" am:
50666fa217
am:
c1ad3c5f29
Change-Id: I81a582d7ad20f062803963a3dc43ddcec288c8ec
Dmitry Shmidt [Wed, 13 Dec 2017 18:04:19 +0000 (18:04 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
am:
50666fa217
Change-Id: Ic97b3742278bcdb2b5ec7b0540a7f7252c5472a4
Dmitry Shmidt [Wed, 13 Dec 2017 17:51:47 +0000 (17:51 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
Alex Chau [Wed, 13 Dec 2017 12:44:31 +0000 (12:44 +0000)]
Make DevicePolicyManager.isAffiliatedUser public
- Simplified javadoc on device affiliation concept. "affiliated with the
device" will be used to describe affiliation with device owner user,
as defined in #isAffiliatedUser javadoc.
- Link to #isAffiliatedUser whenever device affiliation is mentioned
Bug:
67582080
Test: None
Change-Id: I4395ff980aa1626d6ff352d2f16777887784082c
Bo Hu [Wed, 13 Dec 2017 16:56:12 +0000 (16:56 +0000)]
Merge "Check wifi feature before starting wifi service"
Jeff Sharkey [Wed, 13 Dec 2017 16:53:55 +0000 (16:53 +0000)]
Merge "API that reports first SDK level of the device."
TreeHugger Robot [Wed, 13 Dec 2017 16:31:45 +0000 (16:31 +0000)]
Merge "Add Notification Flag behavior test"
TreeHugger Robot [Wed, 13 Dec 2017 16:22:50 +0000 (16:22 +0000)]
Merge "Remove some duplication."
Neil Fuller [Wed, 13 Dec 2017 15:56:56 +0000 (15:56 +0000)]
Merge "Avoid potential failure to boot with bad storage"
Tomasz Wasilczyk [Wed, 13 Dec 2017 15:21:11 +0000 (15:21 +0000)]
Merge "Split internal common utils library to 1.x and 2.x."
Rob Herring [Wed, 29 Nov 2017 15:26:31 +0000 (09:26 -0600)]
renderthread: relax error handling for wide gamut EGL configs
It is valid to advertise EGL_EXT_pixel_format_float, but not have a
the requested EGL config. Instead of aborting, fallback to the default
behavior.
Change-Id: I6c602233b627dc2070364434fece57d3d0aab435
Cc: Romain Guy <romainguy@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Paul Duffin [Wed, 13 Dec 2017 13:42:50 +0000 (13:42 +0000)]
Merge "Remove unnecessary filtering of android.test.mock files"
TreeHugger Robot [Wed, 13 Dec 2017 12:43:40 +0000 (12:43 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Dec 2017 12:37:57 +0000 (12:37 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Dec 2017 12:29:36 +0000 (12:29 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Dec 2017 11:46:10 +0000 (11:46 +0000)]
Merge "Allow profile owners to call removeAccount"
Paul Duffin [Wed, 13 Dec 2017 11:38:20 +0000 (11:38 +0000)]
Merge "Stop dynamically depending on legacy-android-test"
Robert Berry [Wed, 13 Dec 2017 11:32:42 +0000 (11:32 +0000)]
Merge "Move recoverablekeystore package under services"
Tony Mak [Wed, 13 Dec 2017 10:51:05 +0000 (10:51 +0000)]
Merge "Fix trySetQuietModeDisabled may introduce deadlock"
Przemyslaw Szczepaniak [Wed, 13 Dec 2017 10:15:46 +0000 (10:15 +0000)]
Merge changes from topic "deprecated_sdk_1"
* changes:
Reject apks targeting deprecated sdk
Add Build.Version.MIN_SUPPORTED_TARGET_SDK_INT field.
Jack Yu [Wed, 13 Dec 2017 10:00:39 +0000 (10:00 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write" am:
125d736bbe am:
06bf4f618c
am:
8b325a0654 -s ours
Change-Id: Ib10df4c1d18c72dccdca4a202dcf2b07caf7a1d5
Jack Yu [Wed, 13 Dec 2017 09:51:27 +0000 (09:51 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write" am:
125d736bbe
am:
06bf4f618c
Change-Id: I0fb9abd42aa9b995c76969a12b52eb6795acafb2
TreeHugger Robot [Wed, 13 Dec 2017 09:44:36 +0000 (09:44 +0000)]
Merge "Let prepareDrag return error when 0 size drag shadow is specified."
Jack Yu [Wed, 13 Dec 2017 09:42:49 +0000 (09:42 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
am:
125d736bbe
Change-Id: I9b2bd725ddaa40513747e368553c918899987d2f
Treehugger Robot [Wed, 13 Dec 2017 09:29:25 +0000 (09:29 +0000)]
Merge "Added test cases for DataCallResponse parcel read/write"
yro [Tue, 12 Dec 2017 18:52:19 +0000 (10:52 -0800)]
Enable init.rc for statsd to start statsd by default in boot time
Test: manual testing
Change-Id: I1fea9c8a89216df72a9fec6f2f8589170561215a
Bill Yi [Wed, 13 Dec 2017 08:36:14 +0000 (00:36 -0800)]
Import translations. DO NOT MERGE
Change-Id: I507f7aafa814813003145cf802449add25ca8fc7
Auto-generated-cl: translation import
Jack Yu [Thu, 7 Dec 2017 23:49:09 +0000 (15:49 -0800)]
Added test cases for DataCallResponse parcel read/write
bug:
64132030
Test: Unit tests
Merged-In: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
Change-Id: I87a9af987dd7366bfe6b22252e2c4bdc0fbdd727
(cherry picked from commit
14c2aaa0a276807bdf922a3e7ce64bae880e0c68)
Benedict Wong [Fri, 27 Oct 2017 02:41:43 +0000 (19:41 -0700)]
Add reference counted resources to IpSecService
This patch adds (but does not enable the usage of) RefcountedResource
objects to IpSecService, with tests to ensure correct function. This is
patch 1 of a series of patches to refactor the resource management
systems in IpSecService.
RefcountedResource objects allow for management of acyclical dependency
trees, ensuring eventual cleanup when resources are no longer used. This
cleanup may be triggered by binder death or by explicit user action.
Bug:
63409385
Test: New tests written in IpSecServiceRefcountedResourceTest,
explicitly testing the RefcountedResource class
Change-Id: Ib5be7482b2ef5f1c8dec9be68f15e90d8b3aba6d
Paul Duffin [Tue, 12 Dec 2017 16:13:28 +0000 (16:13 +0000)]
Remove unnecessary filtering of android.test.mock files
Previously the android.test.mock files were in the test-runner/src
directory so had to be filtered out of the android.test.runner source
files but the android.test.mock files are now in their own test-mock/src
directory so the filtering is no longer required.
Bug:
30188076
Test: make checkbuild
Change-Id: I1f28fc0735e16fa166663e5797af641b08a4926c
Paul Duffin [Mon, 11 Dec 2017 21:12:06 +0000 (21:12 +0000)]
Stop dynamically depending on legacy-android-test
The legacy-android-test target is deprecated.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* services/tests/shortcutmanagerutils/Android.mk
Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because
legacy-android-test is deprecated and ShortcutManagerTestUtils
source does not depend on it or its classes.
Bug:
30188076
Test: make checkbuild
Change-Id: I1136dde4beb556b839c2c1adf4f1c2264c0cbf5b
bohu [Mon, 11 Dec 2017 19:54:40 +0000 (11:54 -0800)]
Check wifi feature before starting wifi service
Otherwise, Wifi service could crash SystemServer;
for example, on emulator system image where wifi
feature is missing, starting wifi will cause boot
failure.
BUG:
70378659
Change-Id: I82546c2c63fb6736e8216a7942fba2d3c9affb13
Bill Yi [Wed, 13 Dec 2017 06:59:43 +0000 (22:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia72c31e15aa0b8697ddffdbcf865ab768a8704d7
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 13 Dec 2017 06:59:37 +0000 (06:59 +0000)]
Merge "Add config resource specifying WallpaperManagerService"
TreeHugger Robot [Wed, 13 Dec 2017 05:58:04 +0000 (05:58 +0000)]
Merge "Close mDragState immediately when error"
TreeHugger Robot [Wed, 13 Dec 2017 05:32:41 +0000 (05:32 +0000)]
Merge "AAPT2: Remove signatures from multi-APK artifacts."
TreeHugger Robot [Wed, 13 Dec 2017 04:49:10 +0000 (04:49 +0000)]
Merge "renderthread: relax error handling for wide gamut EGL configs"
TreeHugger Robot [Wed, 13 Dec 2017 04:33:39 +0000 (04:33 +0000)]
Merge "Allow multiple standby buckets to be set in one IPC"
TreeHugger Robot [Wed, 13 Dec 2017 04:15:53 +0000 (04:15 +0000)]
Merge "Add pre/post callback to IDragDropCallback"
Daichi Hirono [Tue, 12 Dec 2017 08:54:12 +0000 (17:54 +0900)]
Let prepareDrag return error when 0 size drag shadow is specified.
Since ag/
2837472, creating 0 size surface resulted in raising an
exception. To avoid it, the CL lets prepareDrag return error.
Bug:
70393408
Test: com.android.server.wm.DragDropControllerTests,
android.server.wm.CrossAppDragAndDropTests,
manually check the drag and drop behavior on test app.
Change-Id: Ie0c477dd9e76dd5ec8b7aed6a472e24032777cc8
Daichi Hirono [Fri, 10 Nov 2017 04:51:02 +0000 (13:51 +0900)]
Close mDragState immediately when error
Previously if we encounter an error at performDrag, it sometimes just
returns and lets MSG_DRAG_START_TIMEOUT clean up the drag state.
It means users cannot start another drag and drop operation before
timeout.
The CL fix the error handling so that it immediately cleans the drag
state on errors.
Bug:
69141835
Test: android.server.wm.CrossAppDragAndDropTests, manually check the
drag and drop behavior on test app.
Change-Id: Ibc5784a842eed77e2fa082d8f38d69acc9954e3e
Colin Cross [Wed, 13 Dec 2017 03:43:04 +0000 (19:43 -0800)]
Make services.core the final priorityboosted jar
Other module besides services depend on services.core, and after
I417409281c928ea667d937090d2a0d9d72a449a2 they were getting
the non-priorityboosted version of the jar. Make services.core
a java_library that contains the output of the priorityboosting
java_genrule.
Test: m services
Change-Id: Ic9ca1b8f43f87b0d7d36b53bbc5136a331490c3e
TreeHugger Robot [Wed, 13 Dec 2017 03:06:54 +0000 (03:06 +0000)]
Merge "AAPT2: Remove unused command line option."
TreeHugger Robot [Wed, 13 Dec 2017 03:05:23 +0000 (03:05 +0000)]
Merge "Add getDisallowedSystemApps to DevicePolicyManager"
Eric Erfanian [Wed, 13 Dec 2017 02:42:27 +0000 (02:42 +0000)]
Merge "Add assisted dialing properties to the framework." am:
f5bec0d781 am:
1d9fc9a490
am:
c73edfa2c6 -s ours
Change-Id: I96c354bc5895fe62eafcf1732593910d7aa9c70d
TreeHugger Robot [Wed, 13 Dec 2017 02:35:13 +0000 (02:35 +0000)]
Merge "AAPT2: Add validation for SDK version strings."
Hemant Gupta [Wed, 13 Dec 2017 02:24:30 +0000 (02:24 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am:
045d34ce76 am:
cbfae42c3c
am:
3a670c3c04
Change-Id: Iac4dc53ca9c5e3ebdd0b68590de729e7c76d919d
Eric Erfanian [Wed, 13 Dec 2017 02:21:36 +0000 (02:21 +0000)]
Merge "Add assisted dialing properties to the framework." am:
f5bec0d781
am:
1d9fc9a490
Change-Id: I176ce86a83406d2eecd33cf439085fcc13703a27
TreeHugger Robot [Wed, 13 Dec 2017 02:19:01 +0000 (02:19 +0000)]
Merge "Revert "Add panic detection to back button""
Siarhei Vishniakou [Wed, 13 Dec 2017 00:24:26 +0000 (16:24 -0800)]
Fix identation for switch statement.
Presubmit hooks for repo are currently failing
due to the identation of the body of the switch
statement. Fix this spacing issue here.
Test: None
Change-Id: If96914a9f7345212077215502c5bf537f36e695f
Android Build Merger (Role) [Wed, 13 Dec 2017 02:15:41 +0000 (02:15 +0000)]
Merge "Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am:
9a3132d065 am:
4b7a6339cf am:
cfd06fdc14 -s ours"
TreeHugger Robot [Wed, 13 Dec 2017 02:15:16 +0000 (02:15 +0000)]
Merge "Revert "Add tests for line breaking that considers overhangs""
Colin Cross [Wed, 13 Dec 2017 02:12:30 +0000 (02:12 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am:
9a3132d065 am:
4b7a6339cf
am:
cfd06fdc14 -s ours
Change-Id: I2c773745d1739244839dd86a7c102f2ade3da211
TreeHugger Robot [Wed, 13 Dec 2017 02:07:50 +0000 (02:07 +0000)]
Merge "Tweak ripples"
TreeHugger Robot [Wed, 13 Dec 2017 02:06:32 +0000 (02:06 +0000)]
Merge "Allow additional tags when restoring TaskRecord."
Colin Cross [Wed, 13 Dec 2017 01:57:15 +0000 (01:57 +0000)]
Merge "Remove unused target android.test.mock.sdk" am:
a4c0fa769a am:
9d78e84a8e
am:
39e11f5255 -s ours
Change-Id: I971ace608193c07a107aa5c454dc164b13a47070
Hemant Gupta [Wed, 13 Dec 2017 01:56:18 +0000 (01:56 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference" am:
045d34ce76
am:
cbfae42c3c
Change-Id: I16d491889a4877e6b5b9e602f29d35f83063cf61
Colin Cross [Wed, 13 Dec 2017 01:51:09 +0000 (01:51 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp" am:
9a3132d065
am:
4b7a6339cf
Change-Id: Ie2e2704b0de42b4eef032ad6bdca0f0e114bdd3e
Eric Erfanian [Wed, 13 Dec 2017 01:46:02 +0000 (01:46 +0000)]
Merge "Add assisted dialing properties to the framework."
am:
f5bec0d781
Change-Id: Ic4c118892b964e51136fb730070f2a6b6167b212
Colin Cross [Wed, 13 Dec 2017 01:43:52 +0000 (01:43 +0000)]
Merge "Remove unused target android.test.mock.sdk" am:
a4c0fa769a
am:
9d78e84a8e
Change-Id: Ie20f03c260883345171871196284f4dc2b6d06cd
Android Build Merger (Role) [Wed, 13 Dec 2017 01:41:12 +0000 (01:41 +0000)]
Merge "Merge "Separate android.test.mock from test-runner source" am:
d330eeeeda am:
78160c2577 am:
a5e61f3249 -s ours"
Siyamed Sinir [Wed, 13 Dec 2017 01:37:34 +0000 (01:37 +0000)]
Merge "Enable android.text.SpannableStringBuilderTest"
Colin Cross [Wed, 13 Dec 2017 01:37:03 +0000 (01:37 +0000)]
Merge "Separate android.test.mock from test-runner source" am:
d330eeeeda am:
78160c2577
am:
a5e61f3249 -s ours
Change-Id: I2e266d39925ebd89018c1a61be85c558f0d026b3
Hemant Gupta [Wed, 13 Dec 2017 01:26:35 +0000 (01:26 +0000)]
Merge "Bluetooth: Add support for PBAP UI preference"
am:
045d34ce76
Change-Id: I21f59d9a7df98f37009e730acaf63938304e3af2
Colin Cross [Wed, 13 Dec 2017 01:20:59 +0000 (01:20 +0000)]
Merge "Convert services to Android.bp" am:
5319777274 am:
b8500d4771
am:
0688ef8668 -s ours
Change-Id: I40945253867f1f6c4e4fb43c41ac31d99b719fcc
Colin Cross [Wed, 13 Dec 2017 01:20:42 +0000 (01:20 +0000)]
Merge "Convert legacy-test, test-runner, and test-mock to Android.bp"
am:
9a3132d065
Change-Id: I6a71d49ae1cc7f3cd5b65c523e3e64b3a882e4da