OSDN Git Service
Kang Li [Thu, 31 Aug 2017 00:52:18 +0000 (00:52 +0000)]
Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
am:
f10b0d000e
Change-Id: I6befef8d1f27666e5a6c721378ba5c02cc769947
TreeHugger Robot [Thu, 31 Aug 2017 00:34:57 +0000 (00:34 +0000)]
Merge "Fixes NPE thrown in sort if new targets are added." into oc-mr1-dev
Zhen Sun [Thu, 31 Aug 2017 00:12:12 +0000 (00:12 +0000)]
Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
am:
9174e87722
Change-Id: I1afc6fc7cc2faa929dd343b8cb9caead024e6dc1
jackqdyulei [Thu, 31 Aug 2017 00:06:06 +0000 (00:06 +0000)]
Merge "Add static lock in PowerProfile" into oc-mr1-dev
am:
dcadf1934a
Change-Id: I3ae1a99852d5c9c4a87ee402b3e2e1cc88b8bd0d
Phil Weaver [Wed, 30 Aug 2017 23:56:13 +0000 (23:56 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev am:
0ddaa63b67
am:
666e08ab15 -s ours
Change-Id: Ie37024fa53efb6a243b4bad6bd9e826005630d1e
Phil Weaver [Wed, 30 Aug 2017 23:46:49 +0000 (23:46 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev am:
0ddaa63b67 -s ours
am:
3eda5f4fe8 -s ours
Change-Id: I9eadb28fed6d9e1e7dda322467508449ac12bd59
Chong Zhang [Wed, 30 Aug 2017 23:40:46 +0000 (23:40 +0000)]
Merge "Add heif format to ExifInterface" into oc-mr1-dev
am:
e034a1f5ed
Change-Id: I36fb2559b52bb778acff72954012704da8a85ff9
Phil Weaver [Wed, 30 Aug 2017 23:40:22 +0000 (23:40 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
am:
0ddaa63b67
Change-Id: I84cdc92d542597541266fe506b4a3af160d970b2
Zhen Sun [Wed, 30 Aug 2017 23:37:44 +0000 (23:37 +0000)]
Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 23:35:07 +0000 (23:35 +0000)]
Merge "Add static lock in PowerProfile" into oc-mr1-dev
Phil Weaver [Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
am:
0ddaa63b67 -s ours
Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b
Jason Monk [Wed, 30 Aug 2017 23:06:01 +0000 (23:06 +0000)]
Merge "Don't touch auto dim on app change" into oc-mr1-dev
am:
f7dc1a3290
Change-Id: I25ead35722e66e27361f47eca9ee440bc6b14494
TreeHugger Robot [Wed, 30 Aug 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add heif format to ExifInterface" into oc-mr1-dev
Christine Franks [Wed, 30 Aug 2017 22:58:41 +0000 (22:58 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev
am:
0bb97d9e0b
Change-Id: I858cc44d6037c3b3c33007f71b0721a5663c0740
Phil Weaver [Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
Abodunrinwa Toki [Wed, 30 Aug 2017 22:52:23 +0000 (22:52 +0000)]
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
am:
16da1f545c
Change-Id: Ie527776ced88acf1139ac200b3a855bcd9beb76c
Jason Monk [Wed, 30 Aug 2017 22:44:35 +0000 (22:44 +0000)]
Merge "Don't touch auto dim on app change" into oc-mr1-dev
Paul Mclean [Wed, 30 Aug 2017 22:41:53 +0000 (22:41 +0000)]
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
am:
87cb6d806e
Change-Id: I0a673c8b72d80813f9542d3c122debdc1c1cbef7
Adam Lesinski [Wed, 30 Aug 2017 22:35:40 +0000 (22:35 +0000)]
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
am:
4a8f95ba56
Change-Id: Ia71160c03ec0859cdf93082fc6ced121452a3ad6
Christine Franks [Wed, 30 Aug 2017 22:33:01 +0000 (22:33 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
Paul Mclean [Wed, 30 Aug 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:11:52 +0000 (22:11 +0000)]
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
d9abde75e8 -s ours
Change-Id: Ie47998650cb3304201d7cedac9d5cea1015c14eb
Hall Liu [Wed, 30 Aug 2017 22:00:00 +0000 (22:00 +0000)]
Merge "Make slight API and doc adjustments" into oc-mr1-dev
am:
1407bdd635 -s ours
Change-Id: I1207989a31cc91ca07a82fedd307a05581085b2b
Android Build Merger (Role) [Wed, 30 Aug 2017 21:36:06 +0000 (21:36 +0000)]
Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am:
7aff46195e am:
f124c72600 am:
99317517cb" into oc-mr1-dev-plus-aosp
Edward Savage-Jones [Wed, 30 Aug 2017 21:32:34 +0000 (21:32 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler" am:
7aff46195e am:
f124c72600
am:
99317517cb
Change-Id: I0a9dbba6c94e4ef9dd36d7a7d43a0c36005f47c7
Kang Li [Wed, 30 Aug 2017 21:18:11 +0000 (14:18 -0700)]
Fixes NPE thrown in sort if new targets are added.
Test: manually tested it to verify that it works as expected.
Bug:
65035399
Change-Id: Ie99b05c5324f47cbac66687d7301ef62a7c83e55
Bill Yi [Wed, 30 Aug 2017 21:30:37 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
8ae8079ed6 -s ours
Change-Id: I32655854c6d45f0fb0959a55d502c44d5fe37988
Bill Yi [Wed, 30 Aug 2017 21:25:10 +0000 (21:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
9b9099ef3b -s ours
Change-Id: Ia903a6127eee43bd4eac71869207da7634e22db7
Bill Yi [Wed, 30 Aug 2017 21:19:16 +0000 (21:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
b997ba1131 -s ours
Change-Id: I372f1f65bc2d9918eb6d04c74d0c792516be484c
Bill Yi [Wed, 30 Aug 2017 21:14:03 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
249c45391e -s ours
Change-Id: I6181ef920c9baab4fa905b3d8772083e4f0bc650
Edward Savage-Jones [Wed, 30 Aug 2017 21:10:58 +0000 (21:10 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler" am:
7aff46195e
am:
f124c72600
Change-Id: I664ad0b3d09036bb2bbb0f0ce2e56d22ca042e7e
Bill Yi [Wed, 30 Aug 2017 21:05:22 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
f5bc976699 -s ours
Change-Id: I57c8b921cf49a36adab1bc7b234427c02f1c3337
Edward Savage-Jones [Wed, 30 Aug 2017 20:57:27 +0000 (20:57 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler"
am:
7aff46195e
Change-Id: I3822533c2d7d01c7d804cfd6ad914d36f5ef482f
Bill Yi [Wed, 30 Aug 2017 20:56:39 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
2ec3964ba4 -s ours
Change-Id: I9ca5dad4cd98b4d04d98858575e9f486be245e1f
TreeHugger Robot [Wed, 30 Aug 2017 20:52:19 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 20:48:07 +0000 (20:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
26f4e4dfca -s ours
Change-Id: Ia8bef787b37b25450ad7ee694a11944685ece713
Hall Liu [Wed, 30 Aug 2017 20:41:53 +0000 (20:41 +0000)]
Merge "Make slight API and doc adjustments" into oc-mr1-dev
Treehugger Robot [Wed, 30 Aug 2017 20:40:54 +0000 (20:40 +0000)]
Merge "IllegalArgumentException in MagnificationGestureHandler"
Zhen Sun [Thu, 17 Aug 2017 22:56:20 +0000 (15:56 -0700)]
ATV a11y shortcut (CL 1 of 3): Update key chord
Changed accessibility shortcut key chord from [HOME + DPAD_CENTER] to
[BACK + DPAD_DOWN]. (Followed logic in ag/
1939791.)
Specified AudioAttributes of TV dialog ringtone to
USAGE_ASSISTANCE_ACCESSIBILITY since this dialog is meant to show up for
accessibility shortcut feature and that will also enable Android TVs to
play ringtone for the warning dialog.
Bug:
64346294
Test: Manually use key chord to trigger accessibility shortcut.
Change-Id: Iacb29400079551a3c3ded6f8391b7541bc1c9f29
TreeHugger Robot [Wed, 30 Aug 2017 20:35:52 +0000 (20:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:29:57 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:28:10 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:24:40 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 20:18:07 +0000 (20:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
1dab2308cd -s ours
Change-Id: Ie93b8ab0d1d64cea8f2fcc03171e688788bd0bb0
Jason Monk [Wed, 30 Aug 2017 20:17:19 +0000 (16:17 -0400)]
Don't touch auto dim on app change
Test: manual
Bug:
63630024
Change-Id: I134aa2695bad36606588ca3e52685826f25ea306
TreeHugger Robot [Wed, 30 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Ng [Wed, 30 Aug 2017 20:01:55 +0000 (20:01 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev
am:
45e7a4242b
Change-Id: I902415bf0648c934e1c5e0988e2d2052eb9df013
Bill Yi [Wed, 30 Aug 2017 19:50:09 +0000 (19:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
7604fe28e8 -s ours
Change-Id: I570d19568b3dcb3bc0c8da42232f1de18a197972
TreeHugger Robot [Wed, 30 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Christine Franks [Thu, 27 Jul 2017 00:51:16 +0000 (17:51 -0700)]
Update night display intensity coefficients
Bug:
64019890
Test: manual - adjust intensity slider
Change-Id: I38ec7385b36367e5c9f6c606e65a982efbd32a1b
Jeff Sharkey [Wed, 30 Aug 2017 19:14:21 +0000 (19:14 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
am:
f31cf45e82
Change-Id: Ia6c6d5893d841f21d181363dc01f77efa6579a8f
Jeff Sharkey [Wed, 30 Aug 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
Chris Tate [Wed, 30 Aug 2017 18:54:19 +0000 (18:54 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
am:
b00a8aa688
Change-Id: I71cc12349dd80bbb8b0a6776c3e8846baa3dd501
Brad Ebinger [Wed, 30 Aug 2017 18:48:34 +0000 (18:48 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
am:
ed6e29f292
Change-Id: Id412c0be939da6240a66a942730fd18badabb6c6
Chris Tate [Wed, 30 Aug 2017 18:44:03 +0000 (18:44 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
Chong Zhang [Fri, 25 Aug 2017 23:20:01 +0000 (16:20 -0700)]
Add heif format to ExifInterface
Get heif dimension and rotation from MediaMetadataRetriever.
Bug:
64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e
Brad Ebinger [Wed, 30 Aug 2017 18:31:43 +0000 (18:31 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
Jim Miller [Wed, 30 Aug 2017 18:04:57 +0000 (18:04 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
am:
fb8e9b9096
Change-Id: I2ce2160b4ffa4f088321710a33475debfd7b1212
TreeHugger Robot [Wed, 30 Aug 2017 17:47:46 +0000 (17:47 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
Adam Lesinski [Wed, 30 Aug 2017 02:30:31 +0000 (19:30 -0700)]
BatteryStats: Don't schedule work when shutting down
Prevent more work from being queued when BatteryStats is
shutting down.
Bug:
64901294
Test: manual
Change-Id: Ifc74a4405b40c949e440d6d65fdd13ec40920429
Paul McLean [Fri, 7 Jul 2017 14:14:52 +0000 (08:14 -0600)]
Adding USB audio-class 2.0 spec descriptors.
Added USB audio-class 2.0 format type descriptors.
Added Tree parsing.
Rearchitected reporting (again) to better support reuse and scale.
Bug:
64301464
Test: Run code against representative USB audio peripherals and verify
that each correctly handles or ignores all descriptors and the correct
device semantics (headset / not-headset) are still calculated.
Change-Id: I1b3b01ab1cd804ed876bf6427c3afba15eea6a6e
Jeff Sharkey [Tue, 29 Aug 2017 21:32:13 +0000 (15:32 -0600)]
Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI. For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.
Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.
Thorough testing to verify behavior.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
Todd Kennedy [Wed, 30 Aug 2017 14:00:31 +0000 (14:00 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
am:
f4a484064b
Change-Id: Ief00d5cd83017aa1e48786660e5b94b0f73f4af0
Todd Kennedy [Wed, 30 Aug 2017 13:48:28 +0000 (13:48 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
Abodunrinwa Toki [Tue, 15 Aug 2017 14:05:11 +0000 (15:05 +0100)]
Introduce SmartSelectionEventTracker.
This will be used for logging text selection interaction.
Bug:
64914512
Test: No test. Everything builds fine.
Change-Id: Idb28864e0fc969be05d81855b2e7cd8389bd835e
Kevin Chyn [Wed, 30 Aug 2017 04:13:03 +0000 (04:13 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
am:
102e9e7858
Change-Id: I66a39771ca5d7d1f2648a21a7d4ae484c75c3219
Bill Yi [Wed, 30 Aug 2017 04:00:33 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied35c473af7c2834bc145269270d41c1fbb7563e
TreeHugger Robot [Wed, 30 Aug 2017 03:54:06 +0000 (03:54 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 03:53:42 +0000 (20:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I1dbe08a427134a196041d6b68a220fc2a6a991d8
Tim Murray [Wed, 30 Aug 2017 02:51:26 +0000 (02:51 +0000)]
Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
am:
23c981923f
Change-Id: Iee35e732fea26385d96a3ffa6756d944976f921f
Bill Yi [Wed, 30 Aug 2017 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Id452855fd3f6af7d1daaa2aede1baa65a78c557f
Bill Yi [Wed, 30 Aug 2017 02:35:20 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I67b019a8fa6529ad6540e9c2cc784a413b411fe3
Bill Yi [Wed, 30 Aug 2017 02:29:09 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I16a811e84d3642459e686c84dcc5cecbbf5ada9b
Tim Murray [Wed, 30 Aug 2017 02:13:38 +0000 (02:13 +0000)]
Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 02:10:49 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I48522f7eba9fae610d5551a3dcdf6292a4a0abb8
Bill Yi [Wed, 30 Aug 2017 02:04:00 +0000 (19:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic27c4ce111ea2a017cec2e66812e922991152666
Bill Yi [Wed, 30 Aug 2017 01:57:44 +0000 (18:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4eebbdb73bfd8558666b22135de33f7183ee8ee0
Jason Monk [Wed, 30 Aug 2017 01:56:58 +0000 (01:56 +0000)]
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev
am:
b7e5a9da43
Change-Id: I5446f2a53a502be0e3d2556777bc1583c7059856
Bill Yi [Wed, 30 Aug 2017 01:51:00 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I77ff98cb6d61c557fb070c8ba9939bc7dd5637cd
Bill Yi [Wed, 30 Aug 2017 01:43:54 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6792eb7fe4f28b87cd53504b0c8318a751f33c27
Jason Monk [Wed, 30 Aug 2017 01:24:04 +0000 (01:24 +0000)]
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev
Amith Yamasani [Wed, 30 Aug 2017 01:17:34 +0000 (01:17 +0000)]
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
am:
eb7b039304
Change-Id: Icc808587e11431ba869718732909b65203eca010
Carmen Jackson [Wed, 30 Aug 2017 01:07:24 +0000 (01:07 +0000)]
Merge "Added system_server to system group" into oc-mr1-dev
am:
22d055566a
Change-Id: I0b6deacd471b2a6c082cb2cc916e8ee577045c9e
Colin Cross [Wed, 30 Aug 2017 00:58:16 +0000 (00:58 +0000)]
Merge "Fix errorprone build" am:
3abddeca75 -s ours am:
069915cd1c -s ours
am:
88fa77b640 -s ours
Change-Id: Ife673fc55f2052461ee716fe14844d5636954dce
TreeHugger Robot [Wed, 30 Aug 2017 00:57:23 +0000 (00:57 +0000)]
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 00:53:33 +0000 (00:53 +0000)]
Merge "Added system_server to system group" into oc-mr1-dev
Colin Cross [Wed, 30 Aug 2017 00:46:45 +0000 (00:46 +0000)]
Merge "Fix errorprone build" am:
3abddeca75 -s ours
am:
069915cd1c -s ours
Change-Id: Ifb99a846c309f83f5d31cc81a88ca339787cf68b
Colin Cross [Wed, 30 Aug 2017 00:36:36 +0000 (00:36 +0000)]
Merge "Fix errorprone build"
am:
3abddeca75 -s ours
Change-Id: I9eb51d858194869763c94260beeec05aac6578ee
Fyodor Kupolov [Wed, 30 Aug 2017 00:35:13 +0000 (00:35 +0000)]
Merge "Make shutdown logging thread-safe" into oc-mr1-dev
am:
9328cb9fdf
Change-Id: I862810d4b0f13180e1126db1fdd90e9adf539d9c
Colin Cross [Wed, 30 Aug 2017 00:25:36 +0000 (00:25 +0000)]
Merge "Fix errorprone build"
Fyodor Kupolov [Wed, 30 Aug 2017 00:19:29 +0000 (00:19 +0000)]
Merge "Make shutdown logging thread-safe" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 00:11:28 +0000 (00:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
75c814fb00 -s ours
Change-Id: I3917a1715320b470e66f5caf9e7d2945c6f0de20
Christopher Tate [Wed, 30 Aug 2017 00:05:36 +0000 (00:05 +0000)]
Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev
am:
a050d6302f
Change-Id: I6568f85ca95ab4e20f5f5195c7b7eb4982e8ec57
TreeHugger Robot [Tue, 29 Aug 2017 23:56:50 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
OSDN Git Service
