Ricky Wai
|
c070e5e039
|
Merge \\"Set message id in notification redaction activity\\" into nyc-mr1-dev am: a02e5f73ca
am: fe1cb3ca19
Change-Id: I95f5659dc91872faff8b1261f25233dc8b55e79a
|
2016-06-28 10:45:30 +00:00 |
|
Ricky Wai
|
0c40b37aa1
|
Merge \\"Refresh screenlock UI after password verification failed\\" into nyc-mr1-dev am: 93071a4bc3
am: 6bd1003050
Change-Id: Ibbbe57e789c2520b2e5e8ce109ea647de3602134
|
2016-06-28 10:45:29 +00:00 |
|
Ricky Wai
|
fe1cb3ca19
|
Merge \"Set message id in notification redaction activity\" into nyc-mr1-dev
am: a02e5f73ca
Change-Id: Ia3593ca0a8d64da4efd09cf3c614e028d67e4189
|
2016-06-28 10:42:07 +00:00 |
|
Ricky Wai
|
6bd1003050
|
Merge \"Refresh screenlock UI after password verification failed\" into nyc-mr1-dev
am: 93071a4bc3
Change-Id: I31282a637f8a9c2f4a92a47596d741e1149b1442
|
2016-06-28 10:42:06 +00:00 |
|
Ricky Wai
|
a02e5f73ca
|
Merge "Set message id in notification redaction activity" into nyc-mr1-dev
|
2016-06-28 10:36:43 +00:00 |
|
Ricky Wai
|
93071a4bc3
|
Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev
|
2016-06-28 10:36:19 +00:00 |
|
Steven Ng
|
c5ba27b885
|
Merge \\"Update the OEM unlock preference summary to reflect the disable reason\\" into nyc-mr1-dev am: dbb8cab438
am: 732418cc07
Change-Id: I7a72b986dfa509a0aebc902ed9081f8ef6f3fdaa
|
2016-06-27 19:24:22 +00:00 |
|
Steven Ng
|
732418cc07
|
Merge \"Update the OEM unlock preference summary to reflect the disable reason\" into nyc-mr1-dev
am: dbb8cab438
Change-Id: Ib90a577fdef5fad79c0bf84b8b50d35f2ff688ed
|
2016-06-27 19:20:10 +00:00 |
|
Steven Ng
|
dbb8cab438
|
Merge "Update the OEM unlock preference summary to reflect the disable reason" into nyc-mr1-dev
|
2016-06-27 19:14:38 +00:00 |
|
Steven Ng
|
62917c23fa
|
Merge \\"Disable \\"disable\\" button for the device provision app in the Settings app\\" into nyc-mr1-dev am: 8aee45afb6
am: 4e77176ca3
Change-Id: I86dbad08bd12a2200acc0b341800b2c17d227737
|
2016-06-27 19:06:29 +00:00 |
|
Steven Ng
|
4e77176ca3
|
Merge \"Disable \"disable\" button for the device provision app in the Settings app\" into nyc-mr1-dev
am: 8aee45afb6
Change-Id: Ic6fb6f14c8375acd1b0395ad879ae4868e7f7c79
|
2016-06-27 18:57:18 +00:00 |
|
Jason Monk
|
979e3ddf04
|
Merge \"Merge \\\"Fix DND conditional null state\\\" into nyc-dev am: 733649c2fa am: d944277d1f\" into nyc-mr1-dev-plus-aosp
am: 96169134bc
Change-Id: I876d3dcc6c752fd54d6f2a9e3af7dd93c167cc86
|
2016-06-27 18:50:49 +00:00 |
|
Jason Monk
|
3fc2ca0593
|
Merge \\\"Fix DND conditional null state\\\" into nyc-dev am: 733649c2fa am: 77fc052dd7
am: a7bb1b2f47
Change-Id: I7a69c5d7a5354926e4c4b782e10fbfae3b759c97
|
2016-06-27 18:50:49 +00:00 |
|
Steven Ng
|
8aee45afb6
|
Merge "Disable "disable" button for the device provision app in the Settings app" into nyc-mr1-dev
|
2016-06-27 18:50:02 +00:00 |
|
Android Build Merger (Role)
|
96169134bc
|
Merge "Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa am: d944277d1f" into nyc-mr1-dev-plus-aosp
|
2016-06-27 18:46:46 +00:00 |
|
Jason Monk
|
a7bb1b2f47
|
Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa
am: 77fc052dd7
Change-Id: If6470542c1fbf62dcacfef2cb6d858c18e18cfc6
|
2016-06-27 18:46:31 +00:00 |
|
Jason Monk
|
5490451292
|
Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa
am: d944277d1f
Change-Id: Iff3a2eb2ecb4098237df16f035a054bfaf2b420a
|
2016-06-27 18:46:30 +00:00 |
|
Jason Monk
|
77fc052dd7
|
Merge \"Fix DND conditional null state\" into nyc-dev
am: 733649c2fa
Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c
|
2016-06-27 18:42:15 +00:00 |
|
Jason Monk
|
d944277d1f
|
Merge \"Fix DND conditional null state\" into nyc-dev
am: 733649c2fa
Change-Id: I65fd9c378937f9ce634a679e6779368aa63fc143
|
2016-06-27 18:42:15 +00:00 |
|
Jason Monk
|
733649c2fa
|
Merge "Fix DND conditional null state" into nyc-dev
|
2016-06-27 18:36:21 +00:00 |
|
Bill Yi
|
3ebd6d61e0
|
Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours am: 98fd2d2a82 -s ours
am: 82b84aa9dd -s ours
Change-Id: I8724958e451a73722003d8146d364edba6ec3ce9
|
2016-06-27 18:15:25 +00:00 |
|
Bill Yi
|
82b84aa9dd
|
Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours
am: 98fd2d2a82 -s ours
Change-Id: I7ad92e537878e8eda1bbfccbb871cfc82f18febb
|
2016-06-27 18:09:39 +00:00 |
|
Bill Yi
|
833735ffdb
|
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: ee32cd8cd6 -s ours
am: 7bbd4c250d -s ours
Change-Id: I8e703e38160deaedffd248a0e9baf5f450e7d3ae
|
2016-06-27 17:51:32 +00:00 |
|
Bill Yi
|
5bb628bc9b
|
Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours am: 3040f703d7 -s ours
am: 1417a5b268 -s ours
Change-Id: I5183a52cdea96632273f993c40ab11001ae8f3c2
|
2016-06-27 17:51:31 +00:00 |
|
Victor Chang
|
2d97a6a9fe
|
Merge \\"Add explanatory text displayed when \\'Always-on\\' switch is greyed-out for VPN apps w/targetSdk<24\\" into nyc-mr1-dev am: 4ffd7552a3
am: 8dc82cb436
Change-Id: I826f79e845be20f687b96ba5ba551da13422fcee
|
2016-06-27 17:51:30 +00:00 |
|
Doris Ling
|
68da9b2f34
|
Merge \\"Update UI for the Gestures settings.\\" into nyc-mr1-dev am: 8661620b3a
am: fe4481899e
Change-Id: I073d6e7dbdd0cd6eb93fc4ba1b2dde3826b43bdb
|
2016-06-27 17:51:29 +00:00 |
|
Bill Yi
|
98fd2d2a82
|
Import translations. DO NOT MERGE
am: 5a9f7d6c9a -s ours
Change-Id: I5007277d9a3e980671925b717d4ae2376f1d37f7
|
2016-06-27 17:50:21 +00:00 |
|
Bill Yi
|
7bbd4c250d
|
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: ee32cd8cd6 -s ours
Change-Id: I4f5b370c10e7c5fee36c780a41b3c64d7c268dce
|
2016-06-27 17:38:42 +00:00 |
|
Bill Yi
|
1417a5b268
|
Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours
am: 3040f703d7 -s ours
Change-Id: Ie26f22a668e452286a9588ed2458207302681aa8
|
2016-06-27 17:37:30 +00:00 |
|
Bill Yi
|
3040f703d7
|
Import translations. DO NOT MERGE
am: 5a9f7d6c9a -s ours
Change-Id: Ib444afecf20d6119ab0242571fa931ba1ab944d9
|
2016-06-27 17:33:19 +00:00 |
|
TreeHugger Robot
|
43703b78bd
|
Merge "Import translations. DO NOT MERGE"
|
2016-06-27 17:28:58 +00:00 |
|
TreeHugger Robot
|
ee32cd8cd6
|
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
|
2016-06-27 17:27:52 +00:00 |
|
Victor Chang
|
8dc82cb436
|
Merge \"Add explanatory text displayed when \'Always-on\' switch is greyed-out for VPN apps w/targetSdk<24\" into nyc-mr1-dev
am: 4ffd7552a3
Change-Id: Id90c39eba4f3ce589dd29fe59177f45e7b684c2f
|
2016-06-27 17:19:41 +00:00 |
|
Doris Ling
|
fe4481899e
|
Merge \"Update UI for the Gestures settings.\" into nyc-mr1-dev
am: 8661620b3a
Change-Id: I9391b922b539cd1d096389c671634f700831ae62
|
2016-06-27 17:19:40 +00:00 |
|
Victor Chang
|
4ffd7552a3
|
Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev
|
2016-06-27 17:14:51 +00:00 |
|
Doris Ling
|
8661620b3a
|
Merge "Update UI for the Gestures settings." into nyc-mr1-dev
|
2016-06-27 17:08:30 +00:00 |
|
Victor Chang
|
52247f69a5
|
Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24
Bug: 28413917
Change-Id: I3e7c079b4f91c02e5d0c0e8fda4ac6775dd0247b
|
2016-06-27 18:07:35 +01:00 |
|
Jason Monk
|
095d9e3d3f
|
Fix DND conditional null state
Persist all of the data it needs to produce the UI.
Change-Id: Ifb143b2cd3fef075cd77feaf53051eb8b7153a51
Fixes: 27664882
|
2016-06-27 12:29:47 -04:00 |
|
Fan Zhang
|
990208aeed
|
Merge \\"When offline show a list of countries with phone support.\\" into nyc-mr1-dev am: e9fcb2c930
am: d2b3809cae
Change-Id: I249439dfc1547b27d51bffae6ddacbac78526fd9
|
2016-06-27 15:52:22 +00:00 |
|
Fan Zhang
|
d2b3809cae
|
Merge \"When offline show a list of countries with phone support.\" into nyc-mr1-dev
am: e9fcb2c930
Change-Id: Ic97ecb3c2da78209e58b4a01f5adfbb23d32b32f
|
2016-06-27 15:48:27 +00:00 |
|
Fan Zhang
|
e9fcb2c930
|
Merge "When offline show a list of countries with phone support." into nyc-mr1-dev
|
2016-06-27 15:45:54 +00:00 |
|
Bill Yi
|
e016863c33
|
Import translations. DO NOT MERGE
Change-Id: I2d819a9b21bbfb288820594955e7b17be7c78e61
Auto-generated-cl: translation import
|
2016-06-27 07:43:13 -07:00 |
|
Bill Yi
|
5a9f7d6c9a
|
Import translations. DO NOT MERGE
Change-Id: If45fdc9e3e694f67b9aa78b230fc1491f39f0551
Auto-generated-cl: translation import
|
2016-06-27 07:34:32 -07:00 |
|
Ricky Wai
|
3029bb9eb7
|
Set message id in notification redaction activity
Bug: 29633162
Change-Id: I803789ba719d4f40629a8da49b47cf4548c072f0
|
2016-06-27 15:02:19 +01:00 |
|
Bill Yi
|
cfc13dd889
|
Import translations. DO NOT MERGE
Change-Id: I0a563c30d5cc2265c446a4c5c8651821044f73d1
Auto-generated-cl: translation import
|
2016-06-27 06:58:29 -07:00 |
|
Ricky Wai
|
9aa434cde6
|
Refresh screenlock UI after password verification failed
Bug: 28314264
Change-Id: Ibd715d70bbee728a887f779a24bb99ad32d8d2ed
|
2016-06-27 11:10:09 +01:00 |
|
Maurice Lam
|
a15b20a29c
|
Merge \\"Remove setup specific FP find sensor layout\\" into nyc-mr1-dev am: 17eb2e2ec4
am: ff56688d64
Change-Id: Id3ef77e9f083efbbb33bbb22650c52fb9a7e0a4e
|
2016-06-25 01:38:39 +00:00 |
|
Maurice Lam
|
ff56688d64
|
Merge \"Remove setup specific FP find sensor layout\" into nyc-mr1-dev
am: 17eb2e2ec4
Change-Id: I9914bce9a3c8e4f7e87692a27df87bd2d6532a1a
|
2016-06-25 01:35:26 +00:00 |
|
Maurice Lam
|
17eb2e2ec4
|
Merge "Remove setup specific FP find sensor layout" into nyc-mr1-dev
|
2016-06-25 01:28:42 +00:00 |
|
Evan Rosky
|
c3efefb027
|
Merge "Option to hide swipe method"
|
2016-06-24 21:36:39 +00:00 |
|