git.osdn.net Git - android-x86/frameworks-base.git/log

Victor Chang [Thu, 16 Jun 2016 15:28:55 +0000 (15:28 +0000)]

Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 9feb501659

Change-Id: I0cd6a92a70d8f3310ab1a07709aefe6d42a57412

commit | commitdiff | tree

Victor Chang [Thu, 16 Jun 2016 15:24:23 +0000 (15:24 +0000)]

Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 1e29965a85

Change-Id: Iad489061a9f91d17097f45ff10da50f9210733a1

commit | commitdiff | tree

Victor Chang [Thu, 16 Jun 2016 15:21:12 +0000 (15:21 +0000)]

Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 6437205648

Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb

commit | commitdiff | tree

Victor Chang [Thu, 16 Jun 2016 15:21:07 +0000 (15:21 +0000)]

Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 6437205648

Change-Id: If23d7b5ab2c79874714a9f6a67625b09e7f83699

commit | commitdiff | tree

Victor Chang [Thu, 16 Jun 2016 15:13:32 +0000 (15:13 +0000)]

Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev

commit | commitdiff | tree

Fredrik Roubert [Thu, 16 Jun 2016 13:12:13 +0000 (13:12 +0000)]

Merge \\\"API updated for ICU4J 57.1\\\" am: 4861329f57 am: 438dc91a41
am: 69147f24ae

Change-Id: Ic62119248aeef08141a3f6a9b2d948529997cbcc

commit | commitdiff | tree

Joachim Sauer [Thu, 16 Jun 2016 13:09:12 +0000 (13:09 +0000)]

Merge \\"API updated for ICU4J 57.1\\" am: 4861329f57
am: 438dc91a41

Change-Id: I16a88e2346435b60cc7844784f30be82a775bf5d

commit | commitdiff | tree

Fredrik Roubert [Thu, 16 Jun 2016 13:03:50 +0000 (13:03 +0000)]

Merge \"API updated for ICU4J 57.1\"
am: 4861329f57

Change-Id: I28a8fe77f81a0cb24ed7044046c06677b44c812c

commit | commitdiff | tree

Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:42:40 +0000 (12:42 +0000)]

Merge \\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\" am: 47ef3bf172 am: d37e23c50c
am: 720f31e238

Change-Id: I97f561820d6cb9550e92c2bf2b83017889afc069

commit | commitdiff | tree

Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]

Merge "API updated for ICU4J 57.1"

commit | commitdiff | tree

Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:38:20 +0000 (12:38 +0000)]

Merge \\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\" am: 47ef3bf172
am: d37e23c50c

Change-Id: I852b8efb010fecf7079679694c45d6d8300ea408

commit | commitdiff | tree

Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:33:21 +0000 (12:33 +0000)]

Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am: 47ef3bf172

Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368

commit | commitdiff | tree

Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]

Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"

commit | commitdiff | tree

Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:07:31 +0000 (13:07 +0100)]

Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c

Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 10:43:33 +0000 (10:43 +0000)]

Merge "Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am: 43f6a45e7e am: 18c57b5cd5" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ricky Wai [Thu, 16 Jun 2016 10:42:58 +0000 (10:42 +0000)]

Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am: 43f6a45e7e
am: 18c57b5cd5

Change-Id: I0d8d74bee55f6431a2a61d26d6a54de2d67a33c4

commit | commitdiff | tree

Ricky Wai [Thu, 16 Jun 2016 10:42:56 +0000 (10:42 +0000)]

Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am: 43f6a45e7e
am: c42f5c4410

Change-Id: Ic0d56aafaeb72135fba107616a664f9845bd81f8

commit | commitdiff | tree

Ricky Wai [Thu, 16 Jun 2016 10:39:03 +0000 (10:39 +0000)]

Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am: 43f6a45e7e

Change-Id: If6535443baacec9fc1af2ed376c3ffa25f677103

commit | commitdiff | tree

Ricky Wai [Thu, 16 Jun 2016 10:38:46 +0000 (10:38 +0000)]

Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am: 43f6a45e7e

Change-Id: I061297e1cd98535f666141ea7709d97c3b490f60

commit | commitdiff | tree

Ricky Wai [Thu, 16 Jun 2016 10:33:22 +0000 (10:33 +0000)]

Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 10:30:29 +0000 (10:30 +0000)]

Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76 -s ours am: cf0bd1675c -s ours" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:30:01 +0000 (10:30 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76 -s ours
am: 1ddd928abf -s ours

Change-Id: I130fc02f0118dccfc237edb34f077e92c0dfaa2f

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:30:01 +0000 (10:30 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76 -s ours
am: cf0bd1675c -s ours

Change-Id: Ie9feffc019d1b9c6ae956596c3f1a367700ee39d

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:26:34 +0000 (10:26 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d58da1be76 -s ours

Change-Id: I892cb57187ad5229701d24112490ac48182c5319

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d58da1be76 -s ours

Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46

commit | commitdiff | tree

Robin Lee [Thu, 16 Jun 2016 10:21:39 +0000 (10:21 +0000)]

Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 3e343ffd91
am: c9ac672d85

Change-Id: I12cdcac2581a062313dfc0c854a184485f5fc718

commit | commitdiff | tree

TreeHugger Robot [Thu, 16 Jun 2016 10:21:18 +0000 (10:21 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev

commit | commitdiff | tree

Robin Lee [Thu, 16 Jun 2016 10:14:06 +0000 (10:14 +0000)]

Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 3e343ffd91
am: 0e7abd3fba

Change-Id: I897c48083f8e6786182d023c58f9861996c6d25c

commit | commitdiff | tree

Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]

Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 3e343ffd91

Change-Id: Id363cef8369d63ce4739089d94139e34ed25f665

commit | commitdiff | tree

Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]

Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 3e343ffd91

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 10:09:50 +0000 (10:09 +0000)]

Merge "Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours\" into nyc-mr1-dev am: 74ab23803c -s ours" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 10:09:37 +0000 (10:09 +0000)]

Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: c985571e5e -s ours" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:09:09 +0000 (10:09 +0000)]

Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours\" into nyc-mr1-dev
am: 74ab23803c -s ours

Change-Id: I548d5434c7fcaf9e7d5588f948f7fda21d96c473

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:09:05 +0000 (10:09 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: c985571e5e -s ours

Change-Id: I5ea38f0c7f2ab572ba5adaa6df161136bf782e0d

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:08:55 +0000 (10:08 +0000)]

Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours
am: f924f2130f -s ours

Change-Id: Ie9b5a6e2814d4e7f7b7146c677aeed6932c5b11c

commit | commitdiff | tree

Robin Lee [Thu, 16 Jun 2016 10:06:10 +0000 (10:06 +0000)]

Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 10:03:53 +0000 (10:03 +0000)]

Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 65266b99d2 -s ours" into nyc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 16 Jun 2016 10:03:44 +0000 (10:03 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:03:34 +0000 (10:03 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 65266b99d2 -s ours

Change-Id: I93855bfa75cc031fe4e4d1812c415ae359a34b5b

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:03:28 +0000 (10:03 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 65266b99d2 -s ours

Change-Id: I633386b991908081feeaaf100554c7c455980c13

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 10:03:22 +0000 (10:03 +0000)]

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 5ed24ad6c3 -s ours

Change-Id: I782614166a75a36f637de928b66d527b68413e69

commit | commitdiff | tree

TreeHugger Robot [Thu, 16 Jun 2016 09:58:55 +0000 (09:58 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Thu, 16 Jun 2016 09:57:54 +0000 (09:57 +0000)]

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 08:48:06 +0000 (01:48 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9447404228057a1b952d1ac04f1b1df4d73568b9
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 08:42:16 +0000 (01:42 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8186498fb657aa424eeb74f965fa44f7a053f65c
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 05:10:07 +0000 (22:10 -0700)]

Import translations. DO NOT MERGE

Change-Id: I5d0d4f9c0cc63d726daf44da8cb5f1b11dca276f
Auto-generated-cl: translation import

commit | commitdiff | tree

Bill Yi [Thu, 16 Jun 2016 04:49:11 +0000 (21:49 -0700)]

Import translations. DO NOT MERGE

Change-Id: I3e3e3acf4c81fea5831768ccb73a313d16bab865
Auto-generated-cl: translation import

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 04:31:04 +0000 (04:31 +0000)]

Merge "Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b am: 447ee99755" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Selim Cinek [Thu, 16 Jun 2016 04:30:35 +0000 (04:30 +0000)]

Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
am: 447ee99755

Change-Id: I92627b1729d042c41b72f5449831d3e8b7b29b0b

commit | commitdiff | tree

Selim Cinek [Thu, 16 Jun 2016 04:30:32 +0000 (04:30 +0000)]

Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
am: 0630d92064

Change-Id: I01afc02fe75b0ae7223e9deba6355ed00961faaa

commit | commitdiff | tree

Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]

Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I25bd41f1307233bba14067952086ca7be3118505

commit | commitdiff | tree

Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]

Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I14674254eb79fef58e4dcb1a8d7ecaab24831691

commit | commitdiff | tree

TreeHugger Robot [Thu, 16 Jun 2016 04:19:47 +0000 (04:19 +0000)]

Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 01:43:12 +0000 (01:43 +0000)]

Merge "Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be am: 268a22feb6" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 01:42:48 +0000 (01:42 +0000)]

Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be
am: 268a22feb6

Change-Id: Ib006f8deafe32c69ffab5360c8bb6d4a18f9f9a8

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 01:42:33 +0000 (01:42 +0000)]

Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be
am: c3e651cb52

Change-Id: I395fff24aac498d85703cebcba3c066dff23a19a

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 01:37:29 +0000 (01:37 +0000)]

Remove coarse location pre-grant for preinstalled VrListenerServices.
am: d430f1a0be

Change-Id: I9501d2926246f5f83ef24a5105323d8e43807608

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 01:37:26 +0000 (01:37 +0000)]

Remove coarse location pre-grant for preinstalled VrListenerServices.
am: d430f1a0be

Change-Id: Ibd5f32c4afe864167411c3876e5ab0cc4de33293

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 00:55:41 +0000 (17:55 -0700)]

Remove coarse location pre-grant for preinstalled VrListenerServices.

Bug: 28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 00:43:14 +0000 (00:43 +0000)]

Merge "Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0 am: 336a7cb9b5" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 16 Jun 2016 00:43:01 +0000 (00:43 +0000)]

Merge "Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb am: d80a8e8fe7" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 00:42:24 +0000 (00:42 +0000)]

Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0
am: 336a7cb9b5

Change-Id: I47d538ee1128a00cab1a7a2e375edf5d9c519cf7

commit | commitdiff | tree

Mihai Niță [Thu, 16 Jun 2016 00:42:23 +0000 (00:42 +0000)]

Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb
am: d80a8e8fe7

Change-Id: Ia714522456f1526db276046cb12973df7193b102

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 00:42:03 +0000 (00:42 +0000)]

Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0
am: fafe810a61

Change-Id: I9e1e7ed21669000c664c3a59c681bf706c574907

commit | commitdiff | tree

Mihai Niță [Thu, 16 Jun 2016 00:41:59 +0000 (00:41 +0000)]

Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb
am: 44080ac5bf

Change-Id: Ib9f1021c18187364d23058fdff39405a00402efe

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 00:38:05 +0000 (00:38 +0000)]

Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am: 931a7c03e0

Change-Id: I406724ea21cd7cfde2be6aa922ac636c7b7f23a8

commit | commitdiff | tree

Mihai Nita [Thu, 16 Jun 2016 00:37:54 +0000 (00:37 +0000)]

Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am: c8c9afeacb

Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 00:34:32 +0000 (00:34 +0000)]

Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am: 931a7c03e0

Change-Id: I70301a77d89271e74e69efb92f340f1dbf6b3ca8

commit | commitdiff | tree

Mihai Nita [Thu, 16 Jun 2016 00:34:30 +0000 (00:34 +0000)]

Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am: c8c9afeacb

Change-Id: Iaa4df1af4a18ad0bc4e99a5bd47aa8f6c1357e50

commit | commitdiff | tree

Amith Yamasani [Thu, 16 Jun 2016 00:33:25 +0000 (00:33 +0000)]

Merge \\"More thorough cleansing of expired users\\" into nyc-dev am: 4f2b1b455e
am: c5ffdb9ee4

Change-Id: I8c7bec8db8d0f9271e965fcef079e778b04409e7

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 00:29:31 +0000 (00:29 +0000)]

Merge "Fix VR transition for display on/off sequence." into nyc-dev

commit | commitdiff | tree

Amith Yamasani [Thu, 16 Jun 2016 00:28:45 +0000 (00:28 +0000)]

Merge \\"More thorough cleansing of expired users\\" into nyc-dev am: 4f2b1b455e
am: bf1301f542

Change-Id: Ie4250ddaa0175ff25a85abdbaa59a31b61003752

commit | commitdiff | tree

Mihai Niță [Thu, 16 Jun 2016 00:28:35 +0000 (00:28 +0000)]

Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev

commit | commitdiff | tree

Ruben Brunk [Thu, 16 Jun 2016 00:08:35 +0000 (17:08 -0700)]

Fix VR transition for display on/off sequence.

- Ensure VR transition has been applied before display power
off sequence.

Bug: 29364940
Change-Id: I1224ac653d466919cb418e5c357a748606c4fd7d

commit | commitdiff | tree

Amith Yamasani [Thu, 16 Jun 2016 00:24:17 +0000 (00:24 +0000)]

Merge \"More thorough cleansing of expired users\" into nyc-dev
am: 4f2b1b455e

Change-Id: Ia5388c84b89cdabefe666b483cebe40066e4d26a

commit | commitdiff | tree

Amith Yamasani [Thu, 16 Jun 2016 00:24:14 +0000 (00:24 +0000)]

Merge \"More thorough cleansing of expired users\" into nyc-dev
am: 4f2b1b455e

Change-Id: I5714f73a9b90c0cb8fee653abf799374acfc6232

commit | commitdiff | tree

Amith Yamasani [Thu, 16 Jun 2016 00:14:57 +0000 (00:14 +0000)]

Merge "More thorough cleansing of expired users" into nyc-dev

commit | commitdiff | tree

Mihai Nita [Wed, 15 Jun 2016 23:34:50 +0000 (16:34 -0700)]

Fix for NullPointerException in SuggestedLocaleAdapter

Bug: 28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69

commit | commitdiff | tree

Mady Mellor [Wed, 15 Jun 2016 23:37:03 +0000 (23:37 +0000)]

Merge \\"Fixes issue with group backgrounds when animating to keyguard\\" into nyc-dev am: 8363980d45
am: 3cb4c159f7

Change-Id: I72d03589032791c2c32ca1bb4e94f1bf86467b25

commit | commitdiff | tree

Mady Mellor [Wed, 15 Jun 2016 23:34:11 +0000 (23:34 +0000)]

Merge \\"Fixes issue with group backgrounds when animating to keyguard\\" into nyc-dev am: 8363980d45
am: 337c714364

Change-Id: Ib0492e3f57c1ff6f04d2a5b1b589855dbf842362

commit | commitdiff | tree

Selim Cinek [Wed, 15 Jun 2016 18:46:37 +0000 (11:46 -0700)]

Added dismiss, expand, and collapse accessibility actions

Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1

commit | commitdiff | tree

Mady Mellor [Wed, 15 Jun 2016 23:27:41 +0000 (23:27 +0000)]

Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
am: 8363980d45

Change-Id: Iee12dc78f65a0e4acb09f513fd9578f28f7a5e2e

commit | commitdiff | tree

Mady Mellor [Wed, 15 Jun 2016 23:27:39 +0000 (23:27 +0000)]

Merge \"Fixes issue with group backgrounds when animating to keyguard\" into nyc-dev
am: 8363980d45

Change-Id: I99a748be4a74e917f7e17fdf7ad9a7c52d120a0b

commit | commitdiff | tree

Bert McMeen [Wed, 15 Jun 2016 23:23:19 +0000 (23:23 +0000)]

Merge \\\\"Docs: A removal from docs of an obsolete watch face permission\\\\" into mnc-io-docs am: 9011149e19 am: 7250594f04 am: 0caf0b7259
am: 7716f3ffe7

Change-Id: If175f56915b84732c2995eb22f9c13cce6e8492b

commit | commitdiff | tree

Mady Mellor [Wed, 15 Jun 2016 23:20:22 +0000 (23:20 +0000)]

Merge "Fixes issue with group backgrounds when animating to keyguard" into nyc-dev

commit | commitdiff | tree

Bert McMeen [Wed, 15 Jun 2016 23:19:06 +0000 (23:19 +0000)]

Merge \\\\"Docs: A removal from docs of an obsolete watch face permission\\\\" into mnc-io-docs am: 9011149e19 am: 7250594f04 am: 0caf0b7259
am: 717f3e999c

Change-Id: I7d9451f8ed43e35c7a4666bc351c6300f9845229

commit | commitdiff | tree

Bert McMeen [Wed, 15 Jun 2016 23:13:31 +0000 (23:13 +0000)]

Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am: 9011149e19 am: 7250594f04
am: 0caf0b7259

Change-Id: I1fb1c058b95de1786dd4484a9bde085c522d2af5

commit | commitdiff | tree

Bert McMeen [Wed, 15 Jun 2016 23:13:27 +0000 (23:13 +0000)]

Merge \\\"Docs: A removal from docs of an obsolete watch face permission\\\" into mnc-io-docs am: 9011149e19 am: 7250594f04
am: 0caf0b7259

Change-Id: I34c4adf1e9c003ab24c9fa07f879927fd3db4332

commit | commitdiff | tree

Bert McMeen [Wed, 15 Jun 2016 23:08:28 +0000 (23:08 +0000)]

Merge \\"Docs: A removal from docs of an obsolete watch face permission\\" into mnc-io-docs am: 9011149e19
am: 7250594f04

Change-Id: I486c9ee933a6ed64d90013cf9964e7106713dde8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 15 Jun 2016 23:04:12 +0000 (23:04 +0000)]

Merge "Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am: 9a75ed7ab5 am: 511562ee23" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 23:03:49 +0000 (23:03 +0000)]

Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am: 9a75ed7ab5
am: 511562ee23

Change-Id: I84d8706696ebfc72c66637b34e101f836d398551

commit | commitdiff | tree

Bert McMeen [Wed, 15 Jun 2016 23:03:13 +0000 (23:03 +0000)]

Merge \"Docs: A removal from docs of an obsolete watch face permission\" into mnc-io-docs
am: 9011149e19

Change-Id: If34c51a5c2f8b28612c3526ca40cfce5a9a4a140

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 23:02:42 +0000 (23:02 +0000)]

Merge \\"Fixing issue with screen pinning screen not showing for secondary users.\\" into nyc-dev am: 9a75ed7ab5
am: 43fb1f2ec7

Change-Id: I8d63ffb4111b6bb52a1a3a23bf326b6f8c4860ba

commit | commitdiff | tree

Brad Ebinger [Wed, 15 Jun 2016 23:02:36 +0000 (23:02 +0000)]

Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53
am: e93c91edc2

Change-Id: Ib9854a5a3c570f648701201594ba74ad29ce487b

commit | commitdiff | tree

Adam Lesinski [Wed, 15 Jun 2016 23:02:29 +0000 (23:02 +0000)]

Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
am: 1dda5b39d4

Change-Id: Ia74707d5196b7821ea6e471181277882a339f55c

commit | commitdiff | tree

Bert McMeen [Wed, 15 Jun 2016 22:57:57 +0000 (22:57 +0000)]

Merge "Docs: A removal from docs of an obsolete watch face permission" into mnc-io-docs

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 22:57:30 +0000 (22:57 +0000)]

Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am: 9a75ed7ab5

Change-Id: I4b7de84af1cf78a8871fccd555e27d4997cc21a2

commit | commitdiff | tree

Brad Ebinger [Wed, 15 Jun 2016 22:57:14 +0000 (22:57 +0000)]

Merge \\"Handle Concurrency issues in Connection\\" into nyc-dev am: df41725e53
am: 53a8774be1

Change-Id: Ie9303bed357327079711ba8809fb05c15b9ec7a6

commit | commitdiff | tree

Winson [Wed, 15 Jun 2016 22:57:09 +0000 (22:57 +0000)]

Merge \"Fixing issue with screen pinning screen not showing for secondary users.\" into nyc-dev
am: 9a75ed7ab5

Change-Id: I8dffa83fc2f3cb031062412171453dc7d19a2e66

commit | commitdiff | tree

Adam Lesinski [Wed, 15 Jun 2016 22:57:08 +0000 (22:57 +0000)]

Merge \\"ResourcesManager: Allow managed addition of library asset paths\\" into nyc-dev am: 464bda8a2b
am: c3ab1b7c0a

Change-Id: I6d268a2d0871de19a57358ff7755c525906aae1c