OSDN Git Service
Eric Laurent [Fri, 21 Apr 2017 21:00:03 +0000 (21:00 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev am:
910311b356
am:
e8d82e5d2d
Change-Id: I927e5e64bf605c2cd5f4ac03d0c3dfc02dfdbcc8
Jakub Pawlowski [Fri, 21 Apr 2017 20:56:22 +0000 (20:56 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf am:
e00b92e550 am:
b4be7093da
am:
c611b7ae90
Change-Id: I5b4523adc324a49f78d4f5a9309fc01dfcd14d04
Eric Laurent [Fri, 21 Apr 2017 20:52:49 +0000 (20:52 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
am:
910311b356
Change-Id: I13cbf5a51eaa884527f4df79fe215e4b012082e0
Jakub Pawlowski [Fri, 21 Apr 2017 20:50:07 +0000 (20:50 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf am:
e00b92e550
am:
b4be7093da
Change-Id: I712347c5e3ceaae00fd179e77d62311ef6bba89d
Matthew Ng [Fri, 21 Apr 2017 20:47:19 +0000 (20:47 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev am:
e00febf61c
am:
90734c3d7d
Change-Id: I831832fd22168ff443dca0b49f74e687107478ec
Jakub Pawlowski [Fri, 21 Apr 2017 20:43:55 +0000 (20:43 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf
am:
e00b92e550
Change-Id: I6805a973e91ac16cfc5d1c30567df04e7ed98ba2
TreeHugger Robot [Fri, 21 Apr 2017 20:43:45 +0000 (20:43 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 20:42:21 +0000 (20:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Matthew Ng [Fri, 21 Apr 2017 20:39:21 +0000 (20:39 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
am:
e00febf61c
Change-Id: Icb24d1e3e2845544936268fbbb5d27b48681506d
Jakub Pawlowski [Fri, 21 Apr 2017 20:38:00 +0000 (20:38 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
am:
c8d5f84fcf
Change-Id: Ieec563c19e318e6ffc0716009d554a11ff9f4847
Jeff Sharkey [Fri, 21 Apr 2017 20:35:24 +0000 (20:35 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev am:
0a02259bba
am:
8203c3694a
Change-Id: I4bb0d19647db20e91d06602322fab6914a891d8e
TreeHugger Robot [Fri, 21 Apr 2017 20:30:46 +0000 (20:30 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
Jakub Pawlowski [Fri, 21 Apr 2017 20:28:44 +0000 (20:28 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
Jeff Sharkey [Fri, 21 Apr 2017 20:26:59 +0000 (20:26 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
am:
0a02259bba
Change-Id: I10256e0e19e07f0636561a202cd5a5f38a59047f
Jeff Sharkey [Fri, 21 Apr 2017 20:20:33 +0000 (20:20 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev am:
4b32f7c676
am:
90d020d979
Change-Id: I7988898a2f2404e9af76b95190bd6ad839b85d77
TreeHugger Robot [Fri, 21 Apr 2017 20:20:03 +0000 (20:20 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
Jeff Sharkey [Fri, 21 Apr 2017 20:10:50 +0000 (20:10 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev
am:
4b32f7c676
Change-Id: Ie14bf66fd93d6c461983a5232d4164c815cb56b7
Android Build Merger (Role) [Fri, 21 Apr 2017 20:05:30 +0000 (20:05 +0000)]
Merge "Merge "Add transfer mode support to ColorDrawable" into oc-dev am:
eedceb5721 am:
a17c58ff59"
Lucas Dupin [Fri, 21 Apr 2017 20:04:00 +0000 (20:04 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev am:
eedceb5721
am:
a17c58ff59
Change-Id: Ied2dd786e7a31f53c685b920e119bd127f9d9f82
TreeHugger Robot [Fri, 21 Apr 2017 20:03:39 +0000 (20:03 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock"
Jeff Sharkey [Fri, 21 Apr 2017 20:01:36 +0000 (20:01 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev
Android Build Merger (Role) [Fri, 21 Apr 2017 19:59:18 +0000 (19:59 +0000)]
Merge "Merge "Update HardwareBuffer API." into oc-dev am:
649040c7f6 am:
d5fcb3a45f"
Craig Donner [Fri, 21 Apr 2017 19:58:02 +0000 (19:58 +0000)]
Merge "Update HardwareBuffer API." into oc-dev am:
649040c7f6
am:
d5fcb3a45f
Change-Id: I14b0606c3d7866f68f7b0e7a7458bb4af4236d0e
Kang Li [Fri, 21 Apr 2017 19:53:26 +0000 (19:53 +0000)]
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources."
Lucas Dupin [Fri, 21 Apr 2017 19:44:14 +0000 (19:44 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev
am:
eedceb5721
Change-Id: If27a7e4154dabbeffd2b11ee2b788c9e30b3d9a7
Dianne Hackborn [Fri, 21 Apr 2017 19:41:58 +0000 (19:41 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev am:
0fa2574ecb
am:
a97ee07a5c
Change-Id: I6c938e3c64e7b584dd5f4262646daa3677551f91
Craig Donner [Fri, 21 Apr 2017 19:40:01 +0000 (19:40 +0000)]
Merge "Update HardwareBuffer API." into oc-dev
am:
649040c7f6
Change-Id: I49687761d304075acc048afa2e97e4b0b9b84680
Daniel Sheng [Fri, 21 Apr 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Added Trust Agent category from SUW suggestions"
Dianne Hackborn [Fri, 21 Apr 2017 19:32:27 +0000 (19:32 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev
am:
0fa2574ecb
Change-Id: I7ea8132d0dcda44c25d1d96a1ce4f52f6cb0e72c
TreeHugger Robot [Fri, 21 Apr 2017 19:29:03 +0000 (19:29 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:28:24 +0000 (19:28 +0000)]
Merge "Update HardwareBuffer API." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 19:23:06 +0000 (19:23 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev
Philip P. Moltmann [Fri, 21 Apr 2017 19:17:14 +0000 (19:17 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev am:
ede054a73e
am:
ff104b7792
Change-Id: Ife574a028ce662eadb58f8eab2b9f3601acd9bd0
Wale Ogunwale [Fri, 21 Apr 2017 19:10:39 +0000 (19:10 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev am:
d0c3b9c685
am:
4a724cb5f3
Change-Id: Iaf861b4ec0738daa05002a9060dada4612a6a5d9
Jesse Hall [Fri, 21 Apr 2017 19:05:28 +0000 (19:05 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev am:
489edb395b
am:
89d3d2ae01
Change-Id: I5f3da6a9e9b3bbe621e433947754d79a0e6a3691
Philip P. Moltmann [Fri, 21 Apr 2017 19:01:28 +0000 (19:01 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
am:
ede054a73e
Change-Id: I0f23b28dbb8da1a3182411223bb3edde09fb56d8
Wale Ogunwale [Fri, 21 Apr 2017 18:58:59 +0000 (18:58 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
am:
d0c3b9c685
Change-Id: Ia75c5e478341cac25a7783ee058edd89bd05e7e8
Jordan Liu [Fri, 21 Apr 2017 18:55:36 +0000 (18:55 +0000)]
Merge "Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02 am:
fb0acf3355" into oc-dev-plus-aosp
am:
f36c63052c
Change-Id: I13877d19f9b4e87b906c3262044daca173eb63fb
TreeHugger Robot [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
Joe Fernandez [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev am:
62a24e9493
am:
2bc550372e
Change-Id: Ie95de6fe8e14339d8f077437172353fed511f3f7
Jesse Hall [Fri, 21 Apr 2017 18:52:54 +0000 (18:52 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
am:
489edb395b
Change-Id: Ib258e8485a3bcafef4ec65f4b28caaaeb081189e
Wale Ogunwale [Fri, 21 Apr 2017 18:52:41 +0000 (18:52 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
Joe Fernandez [Fri, 21 Apr 2017 18:51:18 +0000 (18:51 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev am:
28973b3817
am:
474b5af269
Change-Id: I1671edae68637162bf23fe108b78d6490f0d3300
Android Build Merger (Role) [Fri, 21 Apr 2017 18:47:06 +0000 (18:47 +0000)]
Merge "Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02 am:
fb0acf3355" into oc-dev-plus-aosp
Jordan Liu [Fri, 21 Apr 2017 18:45:36 +0000 (18:45 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02
am:
fb0acf3355
Change-Id: I81365ed8a767f4571a62da0ff0ba170badcce462
Joe Fernandez [Fri, 21 Apr 2017 18:44:57 +0000 (18:44 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
am:
62a24e9493
Change-Id: I480054acc8be3934bb7ad25cc932da380fab5d02
Joe Fernandez [Fri, 21 Apr 2017 18:42:54 +0000 (18:42 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
am:
28973b3817
Change-Id: I9bdc0c10f3046f0d6f1c1abe0a8977379121d6b4
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:36:46 +0000 (18:36 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:34:08 +0000 (18:34 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
Jordan Liu [Fri, 21 Apr 2017 18:30:29 +0000 (18:30 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5
am:
9cad054e02
Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e
Jordan Liu [Fri, 21 Apr 2017 18:23:00 +0000 (18:23 +0000)]
Merge "Use SubscriptionId instead of SubId"
am:
946410eef5
Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161
Kang Li [Fri, 21 Apr 2017 18:20:11 +0000 (18:20 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev am:
8b4f17be85
am:
9d6cb20646
Change-Id: I40b3e211111afb40789c13bed940310a96f45fcf
Seigo Nonaka [Fri, 21 Apr 2017 18:18:19 +0000 (18:18 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev am:
5b96e55d90
am:
a121eabf99
Change-Id: Ib4e0860910b498cc8effb5b62b5642d0d9bbd39d
Jordan Liu [Fri, 21 Apr 2017 18:17:51 +0000 (18:17 +0000)]
Merge "Use SubscriptionId instead of SubId"
Jeff Sharkey [Fri, 21 Apr 2017 18:08:39 +0000 (12:08 -0600)]
Move PackageManager to new auto-doc feature!
Test: make -j32 offline-sdk-docs
Bug:
37526420
Change-Id: Ib368042e91be3ed702ede0facaf5c8d8d28853d4
Kang Li [Fri, 21 Apr 2017 18:11:33 +0000 (18:11 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
am:
8b4f17be85
Change-Id: I56bb063e1e6ff9003f852a47db355519dec22a69
Seigo Nonaka [Fri, 21 Apr 2017 18:09:44 +0000 (18:09 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
am:
5b96e55d90
Change-Id: Ic185a25c605e7345afa214d3b50fd859135f7b9b
TreeHugger Robot [Fri, 21 Apr 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:00:51 +0000 (18:00 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
Rebecca Silberstein [Fri, 21 Apr 2017 17:53:23 +0000 (17:53 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev am:
435f1dc7a7 -s ours
am:
a1a3869582 -s ours
Change-Id: If5401c51e5adc428fbcc7a0cc8beeeb23da61d3f
Felipe Leme [Fri, 21 Apr 2017 17:43:45 +0000 (17:43 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev am:
fc533da920
am:
184347912d
Change-Id: Ib49f2d736db07ab73d8d5ff2ca6efa7dc08fa3e2
Rebecca Silberstein [Fri, 21 Apr 2017 17:41:31 +0000 (17:41 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
am:
435f1dc7a7 -s ours
Change-Id: Iec3175ed83e50f31154868b634899373b5c53519
Felipe Leme [Fri, 21 Apr 2017 17:35:12 +0000 (17:35 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
am:
fc533da920
Change-Id: I930aaeaec76f0fa8ffe01bd7ca7bbad0cca977f8
Rebecca Silberstein [Fri, 21 Apr 2017 17:33:41 +0000 (17:33 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
Julia Reynolds [Fri, 21 Apr 2017 17:31:21 +0000 (17:31 +0000)]
Merge "Remove long standing debug code" into oc-dev am:
f74a736add
am:
ce822b2fb7
Change-Id: Ib9702a224dae742c6a6f1418567e537d8e857e84
TreeHugger Robot [Fri, 21 Apr 2017 17:28:09 +0000 (17:28 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
Julia Reynolds [Fri, 21 Apr 2017 17:26:16 +0000 (17:26 +0000)]
Merge "Remove long standing debug code" into oc-dev
am:
f74a736add
Change-Id: Iaf5aba1c4146da1352fea149171832cff88b3978
TreeHugger Robot [Fri, 21 Apr 2017 17:17:17 +0000 (17:17 +0000)]
Merge "Remove long standing debug code" into oc-dev
Daniel Sheng [Fri, 21 Apr 2017 17:17:16 +0000 (10:17 -0700)]
Added Trust Agent category from SUW suggestions
Bug:
36513986
Test: make RunSettingsRoboTests
Change-Id: Ie3b501349fa6ec8542e75231c039d9071d04285c
Dianne Hackborn [Fri, 21 Apr 2017 00:17:48 +0000 (17:17 -0700)]
Fix issue #
32180780: Sync adapters inappropriately being run...
...during full-data backup/restore
The activity manager now tells job scheduler service about the
current backup that is running (only if it is a full backup), it
there is a new condition where we won't consider jobs associated
with the current backup to be ready to run.
Also... just a little optimization here. :) The focus is on
scheduling jobs with a 0 deadline, meaning they should run right
away. Now the timing controller does a quick check for a new
job to see if its constraints are already satisifed, and doesn't
do anything further if that is the case (doesn't add to the list,
doesn't re-evaluate alarms, etc). And in the path to scheduling
a job, we do a check to see if the new job is already ready and if
so then just directly add it to the pending list and schedule it.
Doing this required removing what I think is the last bit of code
relying on handler serializing for thread safety, so now everything
in the job scheduler is protected by our global lock and we can
do whatever we want with the lock held and be assured the state
remains consistent.
Also did some small optimizations to many of the other controllers,
mostly switching from an ArrayList to an ArraySet for their tracked
jobs, since one of the things we do frequently is add/remove jobs.
Finally, added some nullability annotations to the JobScheduler
APIs.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I533fad94ba59468a52fe3d077a0ceab3427f0012
Tony Mak [Fri, 21 Apr 2017 17:00:29 +0000 (17:00 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev am:
035aaddbb3
am:
4fdb1d16fb
Change-Id: I4cb19b60c6ae909d1802cb0f192cc650cc1fa4da
Julia Reynolds [Fri, 21 Apr 2017 16:58:31 +0000 (16:58 +0000)]
Merge "Move companion device check to the handler" into oc-dev am:
077b1ea14d
am:
f1c14812e9
Change-Id: Id74e51010a49907d814e2b32c2138329ecd03ac0
Meng Wang [Fri, 21 Apr 2017 16:52:01 +0000 (16:52 +0000)]
Merge "Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034 am:
96b140489c" into oc-dev-plus-aosp
am:
1b92e2d849
Change-Id: I6df83c2fed6f9f91451c37a49244baff78c03347
Tony Mak [Fri, 21 Apr 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
am:
035aaddbb3
Change-Id: I5b9b7b1a779b46aca047eb589d58a34c456fdf2c
Jason Monk [Fri, 21 Apr 2017 16:49:51 +0000 (16:49 +0000)]
Merge "QS + DND interaction again" into oc-dev am:
d84ff64f96
am:
6b4ee852cf
Change-Id: I953b719e40c99c74768f2cf9bca660d966c6636f
Julia Reynolds [Fri, 21 Apr 2017 16:48:17 +0000 (16:48 +0000)]
Merge "Move companion device check to the handler" into oc-dev
am:
077b1ea14d
Change-Id: Ibb3dcd97136da1d5d131457c2a2596ccc09c1485
Anthony Chen [Fri, 21 Apr 2017 16:46:03 +0000 (16:46 +0000)]
Merge "Modifications to allow notification header to be customized."
Android Build Merger (Role) [Fri, 21 Apr 2017 16:45:45 +0000 (16:45 +0000)]
Merge "Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034 am:
96b140489c" into oc-dev-plus-aosp
Charles He [Fri, 21 Apr 2017 12:45:34 +0000 (13:45 +0100)]
Let unlocked profile verifyCredential under unified lock
When unified work challenge is enabled and the primary user is unlocked,
LockSettingsService should unlock the managed profile subsequently by
calling verifyCredential() in most cases. Previously,
verifyCredential() is not called on managed profiles when any one of the
two conditions are met:
1. when the profile is not yet running
2. when the profile is already unlocked
These were introduced to make sure the managed profile stays locked when
it is in QUIET_MODE (i.e. work mode off).
However, condition 2 is problematic. Specifically, it also prevents auth
tokens, etc., from being refreshed (side effects of verifyCredential()),
even when the profile is not in QUIET_MODE.
We remove condition 2 in this change to make sure verifyCredential() is
still called on the managed profile when it is RUNNING_UNLOCKED.
Condition 1 alone should be able to handle the QUIET_MODE case. Unit
test is also updated in case regression occurs.
Bug:
36851574
Test: runtest frameworks-services -c com.android.server.LockSettingsServiceTests
Test: runtest frameworks-services -c com.android.server.SyntheticPasswordTests
Test: CTS verifier > BYOD managed provisioning > Authentication-bound keys
Test: (all of above are run on both sailfish and angler)
Change-Id: Ice89c1eedacaf07e076252a2a571a1eb100ef791
Meng Wang [Fri, 21 Apr 2017 16:45:00 +0000 (16:45 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034
am:
96b140489c
Change-Id: Icec36f8895e4ffb081989973abf563fddbf2f2fd
TreeHugger Robot [Fri, 21 Apr 2017 16:44:44 +0000 (16:44 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Move companion device check to the handler" into oc-dev
Jason Monk [Fri, 21 Apr 2017 16:43:13 +0000 (16:43 +0000)]
Merge "QS + DND interaction again" into oc-dev
am:
d84ff64f96
Change-Id: I0fa2650cb925001c0212b6d528184577f54451a2
Pavel Grafov [Fri, 21 Apr 2017 16:43:08 +0000 (16:43 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev am:
9c8bb68071
am:
9488302c42
Change-Id: Id6bd824580abfec1b5c7d6ae7c555eecfed39989
Meng Wang [Fri, 21 Apr 2017 16:38:13 +0000 (16:38 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb
am:
03f4a0f034
Change-Id: If62a8b9d7b4a2c36d20cdb00877563a5586a5f72
Bill Yi [Fri, 21 Apr 2017 16:37:10 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
21b5f4063e -s ours
am:
5cdb654cbd -s ours
Change-Id: Idab936d6add40ecb0a7940dde61af850c1a1a8ef
Pavel Grafov [Fri, 21 Apr 2017 16:35:09 +0000 (16:35 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
am:
9c8bb68071
Change-Id: I0c77cdfdf173f50701ce2cf52a3004b6297ff369
Wale Ogunwale [Fri, 21 Apr 2017 16:35:08 +0000 (16:35 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev am:
9daf0e62a4
am:
4dfb7e3db2
Change-Id: I96444e4ebb10084b9109eb340f714bd3e9d80bcc
TreeHugger Robot [Fri, 21 Apr 2017 16:35:02 +0000 (16:35 +0000)]
Merge "QS + DND interaction again" into oc-dev
Meng Wang [Fri, 21 Apr 2017 16:32:12 +0000 (16:32 +0000)]
Merge "Fix error message: getAllowedCarriers"
am:
112d039dfb
Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0
Bill Yi [Fri, 21 Apr 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
21b5f4063e -s ours
Change-Id: Ibe6ea76c93c5203c4d528731aeb8bf691deaea3b
TreeHugger Robot [Fri, 21 Apr 2017 16:28:45 +0000 (16:28 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
Wale Ogunwale [Fri, 21 Apr 2017 16:27:11 +0000 (16:27 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev
am:
9daf0e62a4
Change-Id: Ic610537f8573292e4bead83482b13c545c5b92b8
Bill Yi [Fri, 21 Apr 2017 16:26:39 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
03150c4a29 -s ours
am:
97c12deabb -s ours
Change-Id: I4478c1637241a89f668dfba9747fc6c488026141
TreeHugger Robot [Fri, 21 Apr 2017 16:25:21 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE"
Treehugger Robot [Fri, 21 Apr 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Fix error message: getAllowedCarriers"
TreeHugger Robot [Fri, 21 Apr 2017 16:23:17 +0000 (16:23 +0000)]
Merge "Add remaining tests for Trampoline."
TreeHugger Robot [Fri, 21 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
OSDN Git Service
