OSDN Git Service
Mady Mellor [Sat, 24 Mar 2018 00:22:37 +0000 (00:22 +0000)]
Merge "Add string for 'snooze' action to use in local context menu" into pi-dev
am:
3aa86b427f
Change-Id: Ia9e71131a1ab779bedd6e25163e3f6448abc00c0
Salvador Martinez [Sat, 24 Mar 2018 00:15:51 +0000 (00:15 +0000)]
Merge "Revert the low battery warning title to previous version." into pi-dev
am:
d784f16950
Change-Id: Ia21cbd88e1000215f90f53fce9763551e9995e42
Felipe Leme [Sat, 24 Mar 2018 00:03:23 +0000 (00:03 +0000)]
Merge "Properly set input type on autofill compat mode." into pi-dev
am:
352da45bbb
Change-Id: I7b97497e1d4dfb755e4f49182e27251356d9c372
Selim Cinek [Fri, 23 Mar 2018 23:54:33 +0000 (23:54 +0000)]
Merge "Fix AOD styling when pulsing" into pi-dev
am:
8d114ef8ae
Change-Id: Ib44bb4d340dc884653b501efe2e82ee1950d1534
Chong Zhang [Fri, 23 Mar 2018 23:46:53 +0000 (23:46 +0000)]
Merge "insert exif info for HEIF files" into pi-dev
am:
01aaabdea5
Change-Id: Id85a7f7b3e9171376b99c3b07011695e3b58863b
Todd Kopriva [Fri, 23 Mar 2018 23:36:28 +0000 (23:36 +0000)]
Merge "Merge "docs: fixing bug
36982027 and
30636712, typos" into oc-mr1-dev am:
5b0a4eea8d" into pi-dev
am:
ba22b7f4fd
Change-Id: I73239a97490ea456d5c7d7413e1277307c4caec8
Android Build Merger (Role) [Fri, 23 Mar 2018 23:16:58 +0000 (23:16 +0000)]
Merge "[automerger skipped]Merge "Change null behavior of getCellBandwidths" am:
d3e1c76a99 am:
a3376518a0 -s ours" into pi-dev-plus-aosp
Richard Ledley [Fri, 23 Mar 2018 23:16:18 +0000 (23:16 +0000)]
Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P." into pi-dev
am:
525b182864
Change-Id: I57974b8dc2b55d938ed48760654936d4bce61b11
Eric Schwarzenbach [Fri, 23 Mar 2018 23:15:42 +0000 (23:15 +0000)]
[automerger skipped]Merge "Change null behavior of getCellBandwidths" am:
d3e1c76a99
am:
a3376518a0 -s ours
Change-Id: I57ca17b78ef0a20d23e99312a719ab78ff393ab8
TreeHugger Robot [Fri, 23 Mar 2018 23:11:30 +0000 (23:11 +0000)]
Merge "Add string for 'snooze' action to use in local context menu" into pi-dev
Evan Rosky [Fri, 23 Mar 2018 23:01:19 +0000 (23:01 +0000)]
Merge "Added TestApi for default focus highlight" into pi-dev
am:
87f9818319
Change-Id: I039252a404149a979617d71b2c08f679e025d692
TreeHugger Robot [Fri, 23 Mar 2018 22:57:34 +0000 (22:57 +0000)]
Merge "Revert the low battery warning title to previous version." into pi-dev
Dmitry Dementyev [Fri, 23 Mar 2018 22:55:36 +0000 (22:55 +0000)]
Merge "Add RECOVER_KEYSTORE permission check to all IPC calls in RecoveryController." into pi-dev
am:
69d41b0521
Change-Id: Icd7c8b1aa836ad8cec54c23ed4b0bd0730e722f6
TreeHugger Robot [Fri, 23 Mar 2018 22:49:25 +0000 (22:49 +0000)]
Merge "Properly set input type on autofill compat mode." into pi-dev
Yao Chen [Fri, 23 Mar 2018 22:47:05 +0000 (22:47 +0000)]
Merge "rename neq_all_string to neq_any_string in statsd_config" into pi-dev
am:
3991138f3a
Change-Id: I4ecef0bd8cf40c0a10008bcd1ff38556cfecc160
Amin Shaikh [Fri, 23 Mar 2018 22:41:59 +0000 (22:41 +0000)]
Merge "Ensure TileQueryHelper#mTiles is thread safe." into pi-dev
am:
4cd95f64c2
Change-Id: I21152c6c51fbaa2d924f64f12ddab66ec1c7dce4
TreeHugger Robot [Fri, 23 Mar 2018 22:18:25 +0000 (22:18 +0000)]
Merge "Fix AOD styling when pulsing" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 22:17:35 +0000 (22:17 +0000)]
Merge "insert exif info for HEIF files" into pi-dev
Eric Schwarzenbach [Fri, 23 Mar 2018 22:13:57 +0000 (22:13 +0000)]
Merge "Change null behavior of getCellBandwidths"
am:
d3e1c76a99
Change-Id: I23033f776c9901872d786eced64fdc92e3024bca
Android Build Merger (Role) [Fri, 23 Mar 2018 22:11:57 +0000 (22:11 +0000)]
Merge "Merge "docs: fixing bug
36982027 and
30636712, typos" into oc-mr1-dev am:
5b0a4eea8d" into pi-dev
Todd Kopriva [Fri, 23 Mar 2018 22:11:38 +0000 (22:11 +0000)]
Merge "docs: fixing bug
36982027 and
30636712, typos" into oc-mr1-dev
am:
5b0a4eea8d
Change-Id: Iff4044c52e7ccdf6f7f879b9d5457ce1458b21bd
TreeHugger Robot [Fri, 23 Mar 2018 22:07:15 +0000 (22:07 +0000)]
Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 22:04:04 +0000 (22:04 +0000)]
Merge "Added TestApi for default focus highlight" into pi-dev
Android Build Merger (Role) [Fri, 23 Mar 2018 21:57:51 +0000 (21:57 +0000)]
Merge "Merge "HIDD: Address API Review concerns" into pi-dev am:
4efdab2a74" into pi-dev-plus-aosp
Ivan Podogov [Fri, 23 Mar 2018 21:56:25 +0000 (21:56 +0000)]
Merge "HIDD: Address API Review concerns" into pi-dev
am:
4efdab2a74
Change-Id: Ic452b2f6fd3893889c88e137e1635c60f682b528
Android Build Merger (Role) [Fri, 23 Mar 2018 21:51:11 +0000 (21:51 +0000)]
Merge "Merge "Fix apct test." into pi-dev am:
9451c89341" into pi-dev-plus-aosp
Yi Jin [Fri, 23 Mar 2018 21:50:39 +0000 (21:50 +0000)]
Merge "Fix apct test." into pi-dev
am:
9451c89341
Change-Id: I2b8772f3d66e97c4335ba74a9cc50e469495e108
Todd Kopriva [Fri, 23 Mar 2018 21:48:55 +0000 (21:48 +0000)]
Merge "docs: fixing bug
36982027 and
30636712, typos" into oc-mr1-dev
Android Build Merger (Role) [Fri, 23 Mar 2018 21:48:13 +0000 (21:48 +0000)]
Merge "Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev am:
4e83874b0b" into pi-dev-plus-aosp
Salvador Martinez [Fri, 23 Mar 2018 21:47:29 +0000 (21:47 +0000)]
Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev
am:
4e83874b0b
Change-Id: I21553ef3724ef7f9c67425cf9212e95b7879241b
Android Build Merger (Role) [Fri, 23 Mar 2018 21:44:21 +0000 (21:44 +0000)]
Merge "Merge "Add extra strings for 'tomorrow' text" into pi-dev am:
5558126b11" into pi-dev-plus-aosp
Salvador Martinez [Fri, 23 Mar 2018 21:43:38 +0000 (21:43 +0000)]
Merge "Add extra strings for 'tomorrow' text" into pi-dev
am:
5558126b11
Change-Id: I6bdca6f2af3088a55e7e22e6a466d53e6755352d
Android Build Merger (Role) [Fri, 23 Mar 2018 21:40:26 +0000 (21:40 +0000)]
Merge "Merge "Maintain order in GlobalActions when rotating to/from seascape." into pi-dev am:
e3fa94c1ae" into pi-dev-plus-aosp
Alison Cichowlas [Fri, 23 Mar 2018 21:39:42 +0000 (21:39 +0000)]
Merge "Maintain order in GlobalActions when rotating to/from seascape." into pi-dev
am:
e3fa94c1ae
Change-Id: Ia625908f656523e00526b8d0754b796dac4abeb0
Android Build Merger (Role) [Fri, 23 Mar 2018 21:37:13 +0000 (21:37 +0000)]
Merge "Merge "Update buttons to use proper styles." into pi-dev am:
623658e173" into pi-dev-plus-aosp
Andrew Sapperstein [Fri, 23 Mar 2018 21:35:44 +0000 (21:35 +0000)]
Merge "Update buttons to use proper styles." into pi-dev
am:
623658e173
Change-Id: I1cf213689b7858123efe23d5adad68c1f76da3d4
Dmitry Dementyev [Fri, 23 Mar 2018 21:33:50 +0000 (21:33 +0000)]
Merge "Add RECOVER_KEYSTORE permission check to all IPC calls in RecoveryController." into pi-dev
Android Build Merger (Role) [Fri, 23 Mar 2018 21:32:48 +0000 (21:32 +0000)]
Merge "Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev am:
73b7722c13" into pi-dev-plus-aosp
Robert Berry [Fri, 23 Mar 2018 21:31:58 +0000 (21:31 +0000)]
Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev
am:
73b7722c13
Change-Id: I33b404ffc1e4554c3f3f76a4cd92d10fe4923761
Elliott Hughes [Fri, 23 Mar 2018 21:28:16 +0000 (21:28 +0000)]
Merge "Use ABI_STRING." am:
ca7ce49ecc
am:
da01ce155f
Change-Id: I410e2e8b4aec29c004e32001f04c8560eef470cd
Amin Shaikh [Fri, 23 Mar 2018 21:15:45 +0000 (21:15 +0000)]
Merge "Remove 1dp between mobile signal and battery icons." into pi-dev
am:
e5617cc1b1
Change-Id: I66e52f51cfb4e6b6beecc93cf08f870b309ec227
TreeHugger Robot [Fri, 23 Mar 2018 21:15:02 +0000 (21:15 +0000)]
Merge "rename neq_all_string to neq_any_string in statsd_config" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 21:14:45 +0000 (21:14 +0000)]
Merge "Ensure TileQueryHelper#mTiles is thread safe." into pi-dev
Richard Ledley [Mon, 26 Feb 2018 10:36:00 +0000 (10:36 +0000)]
Add flag to control blocking Smart Replies for apps targeting an Android version below P.
Bug:
73802997
Test: atest SmartReplyConstantsTest
Change-Id: Id340cba09da7931ff6a4689802b3a5f594852a72
(cherry picked from commit
28944cbdcf15128b664ccdaed44c59d3fc64d1db)
Elliott Hughes [Fri, 23 Mar 2018 21:12:13 +0000 (21:12 +0000)]
Merge "Use ABI_STRING."
am:
ca7ce49ecc
Change-Id: I4be742799d7b160f802a27498e00c14896306fb4
John Reck [Fri, 23 Mar 2018 21:07:52 +0000 (21:07 +0000)]
Merge "Add isPivotSet/resetPivot" into pi-dev
am:
6045d66aa2
Change-Id: I29ab902c1a1391d26f95ec1abfa14c887320eb5f
Treehugger Robot [Fri, 23 Mar 2018 21:06:45 +0000 (21:06 +0000)]
Merge "Change null behavior of getCellBandwidths"
Felipe Leme [Fri, 23 Mar 2018 18:45:38 +0000 (11:45 -0700)]
Properly set input type on autofill compat mode.
Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.VirtualContainerActivityTest#testAutofillSync\
CtsAutoFillServiceTestCases:android.autofillservice.cts.VirtualContainerActivityCompatModeTest#testAutofillSync
Fixes:
76173462
Change-Id: Ie400ed5d4426febc34b02f68d6be4d86bc11034f
TreeHugger Robot [Fri, 23 Mar 2018 21:03:34 +0000 (21:03 +0000)]
Merge "HIDD: Address API Review concerns" into pi-dev
Zach Johnson [Fri, 23 Mar 2018 21:03:04 +0000 (21:03 +0000)]
Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev
am:
5bdf063537
Change-Id: I195b1f1da0cd8e94fe1f575cae1c1b052d46ed4a
Bill Yi [Fri, 23 Mar 2018 20:56:36 +0000 (20:56 +0000)]
[automerger skipped]Merge "Import translations. DO NOT MERGE" into pi-dev
am:
6dbc8657d6 -s ours
Change-Id: I171b51c028e0c8ac9734d210e594b8f9dcbb436b
Salvador Martinez [Fri, 23 Mar 2018 20:53:27 +0000 (13:53 -0700)]
Revert the low battery warning title to previous version.
This CL removes the "Turn on Battery Saver" text from the title
since this is already added as an action to the notification.
Test: SysUI tests pass
Bug:
76205767
Change-Id: I7b7f612101c67df994e51dfa824c5af057e02f18
Android Build Merger (Role) [Fri, 23 Mar 2018 20:53:10 +0000 (20:53 +0000)]
Merge "Merge "Provide app launch count in UsageStats" into pi-dev am:
8808edb063" into pi-dev-plus-aosp
TreeHugger Robot [Fri, 23 Mar 2018 20:52:22 +0000 (20:52 +0000)]
Merge "Fix apct test." into pi-dev
Nan Zhang [Fri, 23 Mar 2018 20:51:26 +0000 (20:51 +0000)]
Merge "Add additional droiddoc options for stubs-api" into pi-dev-plus-aosp
Amith Yamasani [Fri, 23 Mar 2018 20:49:16 +0000 (20:49 +0000)]
Merge "Provide app launch count in UsageStats" into pi-dev
am:
8808edb063
Change-Id: I62a73e647fcbfffe5a56fe8229d8fb79738e2a80
Salvador Martinez [Fri, 23 Mar 2018 20:43:10 +0000 (20:43 +0000)]
Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev
Salvador Martinez [Fri, 23 Mar 2018 20:39:58 +0000 (20:39 +0000)]
Revert "Add extra strings for 'tomorrow' text"
This reverts commit
5d9af4f746ec73f1efb099d56d5e00f6867b6f84.
Reason for revert: Just kidding, we don't actually want the word "tomorrow" in the text
Bug:
74413266
Change-Id: If823fd7dab9ab468dc7b1446206a6587fcbd2e53
Amith Yamasani [Fri, 23 Mar 2018 20:42:20 +0000 (20:42 +0000)]
Merge "Handle null user in deletePackageLIF" into pi-dev
am:
ea4f21f62e
Change-Id: Ia953cf2be5fabcc842638f28edb07700e2fccebd
Salvador Martinez [Fri, 23 Mar 2018 20:34:11 +0000 (20:34 +0000)]
Merge "Add extra strings for 'tomorrow' text" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 20:32:12 +0000 (20:32 +0000)]
Merge "Maintain order in GlobalActions when rotating to/from seascape." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 20:18:47 +0000 (20:18 +0000)]
Merge "Update buttons to use proper styles." into pi-dev
Android Build Merger (Role) [Fri, 23 Mar 2018 20:09:43 +0000 (20:09 +0000)]
Merge "Merge "Change null behavior of getCellBandwidths" into pi-dev am:
9b29e5caa0" into pi-dev-plus-aosp
Eric Schwarzenbach [Fri, 23 Mar 2018 20:09:06 +0000 (20:09 +0000)]
Merge "Change null behavior of getCellBandwidths" into pi-dev
am:
9b29e5caa0
Change-Id: I316f112d277e1f1c9f8fd4817a83323d8db78472
Elliott Hughes [Fri, 23 Mar 2018 20:07:03 +0000 (20:07 +0000)]
Merge "Prune files from /data/anr/ by number as well as age." am:
6941fcd88c
am:
0e4c1e8ce3
Change-Id: Ib22b546b4e2e9cad86680ed5cc8c7f8a55488585
TreeHugger Robot [Fri, 23 Mar 2018 20:03:45 +0000 (20:03 +0000)]
Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev
Hansong Zhang [Fri, 23 Mar 2018 20:02:44 +0000 (20:02 +0000)]
Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev
am:
9753e774ce
Change-Id: I39f848921e56d07d78397509687bc56b39a83e79
Elliott Hughes [Fri, 23 Mar 2018 19:59:34 +0000 (19:59 +0000)]
Merge "Prune files from /data/anr/ by number as well as age."
am:
6941fcd88c
Change-Id: Ic0c9601520dc0c4a515f5cbffc4dd33cc35ae0c4
Makoto Onuki [Fri, 23 Mar 2018 19:55:43 +0000 (19:55 +0000)]
Merge "Remove EBS notification" into pi-dev
am:
86c9db64a7
Change-Id: Ie8c2cae4c6705a7f16d32ef157623ed489371940
Elliott Hughes [Fri, 23 Mar 2018 19:51:59 +0000 (19:51 +0000)]
Merge "Use ABI_STRING."
Alice Sheng [Fri, 23 Mar 2018 19:47:06 +0000 (19:47 +0000)]
Merge "Add setting for disabling swap." into pi-dev
am:
7384995cf8
Change-Id: I2a8207237a5cf2e0b2d1be0996aece7542d9b90d
TreeHugger Robot [Fri, 23 Mar 2018 19:42:35 +0000 (19:42 +0000)]
Merge "Remove 1dp between mobile signal and battery icons." into pi-dev
Kurt Marcinkiewicz [Fri, 23 Mar 2018 19:40:39 +0000 (19:40 +0000)]
Merge "Allow specifying a network for SNTP time sync" into pi-dev
am:
991b971acb
Change-Id: I339c77063c72a9d76a5c4cb17052e20fb6e045a6
John Reck [Fri, 23 Mar 2018 19:26:50 +0000 (19:26 +0000)]
Merge "Add isPivotSet/resetPivot" into pi-dev
Amin Shaikh [Wed, 21 Mar 2018 12:13:47 +0000 (08:13 -0400)]
Ensure TileQueryHelper#mTiles is thread safe.
- Ensure TileQueryHelper#mTiles is only modified on the background
thread and a send a copy to listeners.
- Do not call onTilesChanged until all stock tiles are loaded (as
opposed to after each tile) to reduce tile spec recalculation.
- Remove completion callback and instead maintain query state in
TileQueryHelper
Bug:
75415415
Test: manually
Change-Id: I2a20bd916dae0ee9f4c422ec4e2ac3f2d47da3dc
Dmitry Dementyev [Fri, 23 Mar 2018 19:10:09 +0000 (12:10 -0700)]
Add RECOVER_KEYSTORE permission check to all IPC calls in
RecoveryController.
Bug:
76116351
Test: GTS tests under development.
Change-Id: Ia4b01eb790a55e587f5719b94ff6cf2482a8eae1
Fan Zhang [Fri, 23 Mar 2018 19:19:51 +0000 (19:19 +0000)]
Merge "Force sentence case for free form edit preferences" into pi-dev
am:
8e9a1123fa
Change-Id: I5fbcd8b575f111fbc5ac460e471913790523b44d
TreeHugger Robot [Fri, 23 Mar 2018 19:18:41 +0000 (19:18 +0000)]
Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 19:18:34 +0000 (19:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Yu-Han Yang [Fri, 23 Mar 2018 19:17:04 +0000 (19:17 +0000)]
Merge "Make NLP/FLP location request behavior consistent" into pi-dev
am:
d613363920
Change-Id: I8b70a343320a3e3d2445744b7135e0a087d37312
Amith Yamasani [Fri, 23 Mar 2018 19:13:22 +0000 (19:13 +0000)]
Merge "Provide app launch count in UsageStats" into pi-dev
Tony Mak [Fri, 23 Mar 2018 19:11:37 +0000 (19:11 +0000)]
Merge "Fix IME is not working after reboot in kiosk mode" into pi-dev
am:
fb933aef6b
Change-Id: Iace533478e1ab9be5a911c7e6711be00631ad203
Eric Schwarzenbach [Thu, 22 Mar 2018 20:49:25 +0000 (13:49 -0700)]
Change null behavior of getCellBandwidths
Returns empty array instead of null when there are
no cell bandwidths.
Bug:
73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
Merged-In: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
(cherry picked from commit
c119a863501cc21bfe4853ad46987a2021041e2b)
Tej Singh [Fri, 23 Mar 2018 19:06:02 +0000 (19:06 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled""" am:
827a150646
am:
428e05ac6c
Change-Id: I54932a1b45870a75450a605584f09b797a9f2298
Yi Jin [Fri, 23 Mar 2018 19:05:32 +0000 (12:05 -0700)]
Fix apct test.
Bug:
76208934
Test: atest incidentd_test
Change-Id: Ibc101aa3c523398b1e9dd6cff3d6735b4d704667
TreeHugger Robot [Fri, 23 Mar 2018 19:03:27 +0000 (19:03 +0000)]
Merge "Handle null user in deletePackageLIF" into pi-dev
Svet Ganov [Fri, 23 Mar 2018 19:00:33 +0000 (19:00 +0000)]
Merge "Fix resource by name lookup" into pi-dev
am:
909402935c
Change-Id: I6eadfe944f1f2893deb8f9fc6d72e6e3c7171d5e
Tej Singh [Fri, 23 Mar 2018 18:57:43 +0000 (18:57 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""
am:
827a150646
Change-Id: I38a7a8e0124b14d394db96b61d2ac6ceacf4bdb9
Petr Cermak [Fri, 23 Mar 2018 18:55:42 +0000 (18:55 +0000)]
Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev
am:
4341a66b03
Change-Id: I0d1a41c52cfe2b24eaa23cbd8fc49a6ae6493c2f
David Chen [Fri, 23 Mar 2018 18:50:20 +0000 (18:50 +0000)]
Merge "Fix statsd dropping metrics data." into pi-dev
am:
dc2dda5c49
Change-Id: I83ef6b23ecd0083658f011c5248e0c6cfe9bec92
Mihai Popa [Fri, 23 Mar 2018 18:44:38 +0000 (18:44 +0000)]
Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev
am:
14372aaabc
Change-Id: I809c725f2bc11929047a7047b4b24a7edbc1260b
David Brazdil [Fri, 23 Mar 2018 18:37:13 +0000 (18:37 +0000)]
Merge "Whitelist com.android.perftests.core in am instrument." into pi-dev
am:
600f3bb4fb
Change-Id: I6fba00155940fe5172be84254af1ce5cc077ac4a
Dmitry Dementyev [Fri, 23 Mar 2018 18:31:59 +0000 (18:31 +0000)]
Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev
am:
95f2965a74
Change-Id: I2e44ca18a1f3fa928f3a3529a1425a483dd34d06
Eric Schwarzenbach [Fri, 23 Mar 2018 18:31:43 +0000 (18:31 +0000)]
Merge "Change null behavior of getCellBandwidths" into pi-dev
Elliott Hughes [Fri, 23 Mar 2018 18:27:04 +0000 (11:27 -0700)]
Use ABI_STRING.
Bug: N/A
Test: builds
Change-Id: I5a9d2a6604887f1f0e9583086e012a086042b7df
TreeHugger Robot [Fri, 23 Mar 2018 18:22:27 +0000 (18:22 +0000)]
Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev
Emilian Peev [Fri, 23 Mar 2018 18:20:08 +0000 (18:20 +0000)]
Merge changes from topic "bug73953366_bug74605221" into pi-dev
am:
7ed5fb3e1d
Change-Id: I5d435b2c2edfeaaca0e12f1af222680f71dad2fc
Emilian Peev [Fri, 23 Mar 2018 18:15:35 +0000 (18:15 +0000)]
Camera: Camera shouldn't throw 'RejectedExecutionException'
am:
b9a5194e9e
Change-Id: Ic4dd87d89f91822fce82c5ca27632f69716279e5
Makoto Onuki [Fri, 23 Mar 2018 18:14:30 +0000 (18:14 +0000)]
Merge "Remove EBS notification" into pi-dev
Mady Mellor [Fri, 23 Mar 2018 18:14:17 +0000 (11:14 -0700)]
Add string for 'snooze' action to use in local context menu
Just getting string in for translation; work to add to
local context menu will come in follow up
Test: make
Bug:
34840333
Change-Id: Id23c0f5cc708bb8847601f792f12f1365bca674b
OSDN Git Service
