OSDN Git Service
Jason Monk [Mon, 27 Jun 2016 18:50:49 +0000 (18:50 +0000)]
Merge \\\"Fix DND conditional null state\\\" into nyc-dev am:
733649c2fa am:
77fc052dd7
am:
a7bb1b2f47
Change-Id: I7a69c5d7a5354926e4c4b782e10fbfae3b759c97
Jason Monk [Mon, 27 Jun 2016 18:46:31 +0000 (18:46 +0000)]
Merge \\"Fix DND conditional null state\\" into nyc-dev am:
733649c2fa
am:
77fc052dd7
Change-Id: If6470542c1fbf62dcacfef2cb6d858c18e18cfc6
Jason Monk [Mon, 27 Jun 2016 18:42:15 +0000 (18:42 +0000)]
Merge \"Fix DND conditional null state\" into nyc-dev
am:
733649c2fa
Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c
Jason Monk [Mon, 27 Jun 2016 18:36:21 +0000 (18:36 +0000)]
Merge "Fix DND conditional null state" into nyc-dev
Bill Yi [Mon, 27 Jun 2016 18:15:25 +0000 (18:15 +0000)]
Import translations. DO NOT MERGE am:
5a9f7d6c9a -s ours am:
98fd2d2a82 -s ours
am:
82b84aa9dd -s ours
Change-Id: I8724958e451a73722003d8146d364edba6ec3ce9
Bill Yi [Mon, 27 Jun 2016 18:09:39 +0000 (18:09 +0000)]
Import translations. DO NOT MERGE am:
5a9f7d6c9a -s ours
am:
98fd2d2a82 -s ours
Change-Id: I7ad92e537878e8eda1bbfccbb871cfc82f18febb
Bill Yi [Mon, 27 Jun 2016 17:51:32 +0000 (17:51 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
ee32cd8cd6 -s ours
am:
7bbd4c250d -s ours
Change-Id: I8e703e38160deaedffd248a0e9baf5f450e7d3ae
Bill Yi [Mon, 27 Jun 2016 17:51:31 +0000 (17:51 +0000)]
Import translations. DO NOT MERGE am:
5a9f7d6c9a -s ours am:
3040f703d7 -s ours
am:
1417a5b268 -s ours
Change-Id: I5183a52cdea96632273f993c40ab11001ae8f3c2
Victor Chang [Mon, 27 Jun 2016 17:51:30 +0000 (17:51 +0000)]
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
Doris Ling [Mon, 27 Jun 2016 17:51:29 +0000 (17:51 +0000)]
Merge \\"Update UI for the Gestures settings.\\" into nyc-mr1-dev am:
8661620b3a
am:
fe4481899e
Change-Id: I073d6e7dbdd0cd6eb93fc4ba1b2dde3826b43bdb
Bill Yi [Mon, 27 Jun 2016 17:50:21 +0000 (17:50 +0000)]
Import translations. DO NOT MERGE
am:
5a9f7d6c9a -s ours
Change-Id: I5007277d9a3e980671925b717d4ae2376f1d37f7
Bill Yi [Mon, 27 Jun 2016 17:38:42 +0000 (17:38 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
ee32cd8cd6 -s ours
Change-Id: I4f5b370c10e7c5fee36c780a41b3c64d7c268dce
Bill Yi [Mon, 27 Jun 2016 17:37:30 +0000 (17:37 +0000)]
Import translations. DO NOT MERGE am:
5a9f7d6c9a -s ours
am:
3040f703d7 -s ours
Change-Id: Ie26f22a668e452286a9588ed2458207302681aa8
Bill Yi [Mon, 27 Jun 2016 17:33:19 +0000 (17:33 +0000)]
Import translations. DO NOT MERGE
am:
5a9f7d6c9a -s ours
Change-Id: Ib444afecf20d6119ab0242571fa931ba1ab944d9
TreeHugger Robot [Mon, 27 Jun 2016 17:28:58 +0000 (17:28 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 27 Jun 2016 17:27:51 +0000 (17:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Victor Chang [Mon, 27 Jun 2016 17:19:41 +0000 (17:19 +0000)]
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
Doris Ling [Mon, 27 Jun 2016 17:19:40 +0000 (17:19 +0000)]
Merge \"Update UI for the Gestures settings.\" into nyc-mr1-dev
am:
8661620b3a
Change-Id: I9391b922b539cd1d096389c671634f700831ae62
Victor Chang [Mon, 27 Jun 2016 17:14:50 +0000 (17:14 +0000)]
Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev
Doris Ling [Mon, 27 Jun 2016 17:08:30 +0000 (17:08 +0000)]
Merge "Update UI for the Gestures settings." into nyc-mr1-dev
Victor Chang [Fri, 24 Jun 2016 15:32:28 +0000 (16:32 +0100)]
Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24
Bug:
28413917
Change-Id: I3e7c079b4f91c02e5d0c0e8fda4ac6775dd0247b
Jason Monk [Mon, 27 Jun 2016 16:29:47 +0000 (12:29 -0400)]
Fix DND conditional null state
Persist all of the data it needs to produce the UI.
Change-Id: Ifb143b2cd3fef075cd77feaf53051eb8b7153a51
Fixes:
27664882
Fan Zhang [Mon, 27 Jun 2016 15:52:22 +0000 (15:52 +0000)]
Merge \\"When offline show a list of countries with phone support.\\" into nyc-mr1-dev am:
e9fcb2c930
am:
d2b3809cae
Change-Id: I249439dfc1547b27d51bffae6ddacbac78526fd9
Fan Zhang [Mon, 27 Jun 2016 15:48:27 +0000 (15:48 +0000)]
Merge \"When offline show a list of countries with phone support.\" into nyc-mr1-dev
am:
e9fcb2c930
Change-Id: Ic97ecb3c2da78209e58b4a01f5adfbb23d32b32f
Fan Zhang [Mon, 27 Jun 2016 15:45:53 +0000 (15:45 +0000)]
Merge "When offline show a list of countries with phone support." into nyc-mr1-dev
Bill Yi [Mon, 27 Jun 2016 14:43:13 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2d819a9b21bbfb288820594955e7b17be7c78e61
Auto-generated-cl: translation import
Bill Yi [Mon, 27 Jun 2016 14:34:32 +0000 (07:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: If45fdc9e3e694f67b9aa78b230fc1491f39f0551
Auto-generated-cl: translation import
Bill Yi [Mon, 27 Jun 2016 13:58:29 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0a563c30d5cc2265c446a4c5c8651821044f73d1
Auto-generated-cl: translation import
Maurice Lam [Sat, 25 Jun 2016 01:38:39 +0000 (01:38 +0000)]
Merge \\"Remove setup specific FP find sensor layout\\" into nyc-mr1-dev am:
17eb2e2ec4
am:
ff56688d64
Change-Id: Id3ef77e9f083efbbb33bbb22650c52fb9a7e0a4e
Maurice Lam [Sat, 25 Jun 2016 01:35:26 +0000 (01:35 +0000)]
Merge \"Remove setup specific FP find sensor layout\" into nyc-mr1-dev
am:
17eb2e2ec4
Change-Id: I9914bce9a3c8e4f7e87692a27df87bd2d6532a1a
Maurice Lam [Sat, 25 Jun 2016 01:28:42 +0000 (01:28 +0000)]
Merge "Remove setup specific FP find sensor layout" into nyc-mr1-dev
Evan Rosky [Fri, 24 Jun 2016 21:36:38 +0000 (21:36 +0000)]
Merge "Option to hide swipe method"
Fan Zhang [Thu, 23 Jun 2016 18:04:21 +0000 (11:04 -0700)]
When offline show a list of countries with phone support.
Bug:
29105266
TODO:
- Support phones UI for international travel
- Selecting default country
- Show operation hours for selected country
Change-Id: I08a6780497dfcb9b9dc8670f2705d01df021c57b
Doris Ling [Wed, 22 Jun 2016 01:25:11 +0000 (18:25 -0700)]
Update UI for the Gestures settings.
1. Remove list divider
2. Set title background color to white
3. Set color filter on animation preview so that its color matches the
color of the video.
Bug:
28565958
Change-Id: I496915ebdb8e358a0f7682f6075d32a04d8d358a
Jason Monk [Fri, 24 Jun 2016 20:37:46 +0000 (20:37 +0000)]
Fix crash in AppDataUsage am:
3763b581a3 am:
f96376a186
am:
87c6bc8ce9
Change-Id: If4801ea4f1a9d6fe5d94c19b182ce8fcba7b8b12
Jason Monk [Fri, 24 Jun 2016 20:32:46 +0000 (20:32 +0000)]
Fix crash in AppDataUsage am:
3763b581a3
am:
f96376a186
Change-Id: I6c261c25292887fad35b963bfce5847dc20d97df
Jason Monk [Fri, 24 Jun 2016 20:31:42 +0000 (20:31 +0000)]
Fix crash in AppDataUsage am:
3763b581a3 am:
55f6f052e4
am:
0795570d00
Change-Id: Ic60b797671606527b1b2dbcc55ae42b8926fd7fb
Jason Monk [Fri, 24 Jun 2016 20:29:11 +0000 (20:29 +0000)]
Fix crash in AppDataUsage am:
3763b581a3
am:
55f6f052e4
Change-Id: I0e869cb33d5106cbe35029e44180fb51c8382d21
Jason Monk [Fri, 24 Jun 2016 20:26:50 +0000 (20:26 +0000)]
Fix crash in AppDataUsage
am:
3763b581a3
Change-Id: I17025581ac647185444b0eaf4ff7f572bca23efd
Jason Monk [Fri, 24 Jun 2016 20:26:48 +0000 (20:26 +0000)]
Fix crash in AppDataUsage
am:
3763b581a3
Change-Id: I457ee4ed3c1c83d95f20e8c9004918a140f328a7
mariagpuyol [Fri, 24 Jun 2016 17:27:54 +0000 (17:27 +0000)]
Make Emergency info searchable in Settings am:
6056eba0e7
am:
eb086f075e
Change-Id: Ib1bdfce801a0efae131779df7b6b907760dedf47
mariagpuyol [Fri, 24 Jun 2016 17:12:40 +0000 (17:12 +0000)]
Make Emergency info searchable in Settings
am:
6056eba0e7
Change-Id: I09900a3059d69f870f8f5efdabad4c67cadf49ae
mariagpuyol [Thu, 23 Jun 2016 15:06:52 +0000 (08:06 -0700)]
Make Emergency info searchable in Settings
Bug:
27925442
Change-Id: I1318592b09f7cf1daf538edd02321cb6557b289e
Jason Monk [Fri, 24 Jun 2016 14:37:12 +0000 (10:37 -0400)]
Fix crash in AppDataUsage
Better handling of detecting apps
Change-Id: I15644c8d28f394aeac021af856d0d755d7a986c6
Fixes:
29609311
Bill Yi [Fri, 24 Jun 2016 06:38:37 +0000 (06:38 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am:
9439574d34 -s ours
am:
d916e7de44 -s ours
Change-Id: I0de7400d1b656c100ea2b5c2cec7fba9305aea81
Bill Yi [Fri, 24 Jun 2016 06:38:36 +0000 (06:38 +0000)]
Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
5bb180388a -s ours am:
699bdb38ba -s ours\" into nyc-mr1-dev-plus-aosp
am:
ea2427cf9f -s ours
Change-Id: Iaa15419820cae9789e428dbfee4ae4dfab074ffb
Bill Yi [Fri, 24 Jun 2016 06:38:34 +0000 (06:38 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am:
5bb180388a -s ours am:
1072cc1175 -s ours
am:
e266de3282 -s ours
Change-Id: Id30c8db5c1c56184960755c9afdc7fd19be07323
Bill Yi [Fri, 24 Jun 2016 06:36:29 +0000 (06:36 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
9439574d34 -s ours
Change-Id: I3bffb8f39c8f4098391ea8105c4f9137e00f2d37
Android Build Merger (Role) [Fri, 24 Jun 2016 06:34:46 +0000 (06:34 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
5bb180388a -s ours am:
699bdb38ba -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Fri, 24 Jun 2016 06:34:35 +0000 (06:34 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
5bb180388a -s ours
am:
699bdb38ba -s ours
Change-Id: I3b5b4128cc2f46555155830d7e8e80285ef9e53b
Bill Yi [Fri, 24 Jun 2016 06:34:34 +0000 (06:34 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
5bb180388a -s ours
am:
1072cc1175 -s ours
Change-Id: I63a62b20953668ba82cf05387041cfa8b1d2e0bb
TreeHugger Robot [Fri, 24 Jun 2016 06:32:53 +0000 (06:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Fri, 24 Jun 2016 06:30:26 +0000 (06:30 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
5bb180388a -s ours
Change-Id: I13908cbf3a74b215e12c271642722424470e30c6
Bill Yi [Fri, 24 Jun 2016 06:30:26 +0000 (06:30 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
5bb180388a -s ours
Change-Id: I7f0781cb71e8c9382e0085a7070a0c5aa00ae647
TreeHugger Robot [Fri, 24 Jun 2016 06:22:56 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:50:59 +0000 (05:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 24 Jun 2016 05:11:31 +0000 (22:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I34aedbc52d5223b977ea7ef5899a54bae1bbf51a
Auto-generated-cl: translation import
Bill Yi [Fri, 24 Jun 2016 05:02:51 +0000 (22:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I99973d29e54e0ccd4d0ec2e3e631f0d7d8f57c8a
Auto-generated-cl: translation import
Bill Yi [Fri, 24 Jun 2016 04:27:14 +0000 (21:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id00cbd78f8d8c7e508811a30afac4d73a9fc6d2b
Auto-generated-cl: translation import
Maurice Lam [Fri, 24 Jun 2016 03:30:52 +0000 (20:30 -0700)]
Remove setup specific FP find sensor layout
Remove the setup variant layout of fingerprint find sensor, because
the regular one is also GLIF themed, and positions the graphic
correctly.
Bug:
29421687
Change-Id: I20dee43c657434f63e73b5c32eb9a492d6786de5
Felipe Leme [Fri, 24 Jun 2016 01:24:24 +0000 (01:24 +0000)]
Merge \"Don\\\'t toggle Data Saver again until it receives a callback. am:
484caa3035 am:
a6ec072541\" into nyc-mr1-dev-plus-aosp
am:
bf74f68fd9
Change-Id: I924d835b23fb185c52c76f2c9c6f488e2b039b1c
Felipe Leme [Fri, 24 Jun 2016 01:24:23 +0000 (01:24 +0000)]
Don\\\'t toggle Data Saver again until it receives a callback. am:
484caa3035 am:
78756838a7
am:
2180901e30
Change-Id: I9a5621ff61b75970116a5581d52af7d57626f1f8
Android Build Merger (Role) [Fri, 24 Jun 2016 01:20:23 +0000 (01:20 +0000)]
Merge "Don\\'t toggle Data Saver again until it receives a callback. am:
484caa3035 am:
a6ec072541" into nyc-mr1-dev-plus-aosp
Felipe Leme [Fri, 24 Jun 2016 01:20:15 +0000 (01:20 +0000)]
Don\\'t toggle Data Saver again until it receives a callback. am:
484caa3035
am:
a6ec072541
Change-Id: Ia790b33199dd537baf36455956864d39535bcc77
Felipe Leme [Fri, 24 Jun 2016 01:20:02 +0000 (01:20 +0000)]
Don\\'t toggle Data Saver again until it receives a callback. am:
484caa3035
am:
78756838a7
Change-Id: I4c8b69abdfeb740aac87f70cf4c3e305984cb557
Felipe Leme [Fri, 24 Jun 2016 01:16:29 +0000 (01:16 +0000)]
Don\'t toggle Data Saver again until it receives a callback.
am:
484caa3035
Change-Id: Ib81e52c99e227318a3575c1d7bf03ffd36ce1f74
Felipe Leme [Fri, 24 Jun 2016 01:15:45 +0000 (01:15 +0000)]
Don\'t toggle Data Saver again until it receives a callback.
am:
484caa3035
Change-Id: Ib4b48a02015b81791d5bb77242968ca7c66b0621
Felipe Leme [Thu, 23 Jun 2016 22:18:11 +0000 (15:18 -0700)]
Don't toggle Data Saver again until it receives a callback.
BUG:
29253107
Change-Id: I4371f947086a45be6709d2a560d27d1f5f0e79c4
Christine Hallstrom [Thu, 23 Jun 2016 20:56:40 +0000 (20:56 +0000)]
Log whether BT pairing dialog is accepted or canceled am:
ac47013154
am:
e8fe657b46
Change-Id: If947ee29ae057437fa5f677fabbef19c1d5a5450
Christine Hallstrom [Thu, 23 Jun 2016 20:53:59 +0000 (20:53 +0000)]
Log whether BT pairing dialog is accepted or canceled
am:
ac47013154
Change-Id: I09bdaf679b490bfb361c1648a8eee9f57db8b566
Christine Hallstrom [Wed, 22 Jun 2016 22:46:35 +0000 (15:46 -0700)]
Log whether BT pairing dialog is accepted or canceled
Change-Id: I584cef273f16e27cd7e569b53abccedfe0bd0af7
Evan Rosky [Fri, 10 Jun 2016 19:15:22 +0000 (12:15 -0700)]
Option to hide swipe method
Bug:
27502832
Change-Id: Ia61b63279fa6f831fdfa9209747b0cbcbf807d50
Jack Yu [Thu, 23 Jun 2016 19:13:49 +0000 (19:13 +0000)]
Merge \\"Added multi sim support back for brazil channel 50 messages.\\" into nyc-mr1-dev am:
f0c929017f
am:
c65ba9b08c
Change-Id: Id08987b8fee1f5ff8fb125520d97e4ffda7d4df2
Andrew Sapperstein [Thu, 23 Jun 2016 19:10:04 +0000 (19:10 +0000)]
Merge \\"Use colorSecondary for switch bar backgrounds.\\" into nyc-mr1-dev am:
da926355c0
am:
5edd0b945c
Change-Id: I278085d32cc6a2481f95a334e18af02a895ddda8
Jack Yu [Thu, 23 Jun 2016 18:45:17 +0000 (18:45 +0000)]
Merge \"Added multi sim support back for brazil channel 50 messages.\" into nyc-mr1-dev
am:
f0c929017f
Change-Id: I49f1729d081f834715066ab690f8ca8808aa6f61
Andrew Sapperstein [Thu, 23 Jun 2016 18:45:03 +0000 (18:45 +0000)]
Merge \"Use colorSecondary for switch bar backgrounds.\" into nyc-mr1-dev
am:
da926355c0
Change-Id: I0f5a0fe312bb922ddeb709e1bf480f2d03fcd27d
Jack Yu [Thu, 23 Jun 2016 18:41:21 +0000 (18:41 +0000)]
Merge "Added multi sim support back for brazil channel 50 messages." into nyc-mr1-dev
Andrew Sapperstein [Thu, 23 Jun 2016 18:37:40 +0000 (18:37 +0000)]
Merge "Use colorSecondary for switch bar backgrounds." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 17:44:38 +0000 (17:44 +0000)]
Merge \\"Display operation hours when support is closed.\\" into nyc-mr1-dev am:
c3a0a18f77
am:
6485952e26
Change-Id: Ia66d9982a4cbdd6b3b2d5d45766dcb0cb446a34a
Fan Zhang [Thu, 23 Jun 2016 17:44:34 +0000 (17:44 +0000)]
Merge \\"Bug fix: support tab doesn\\'t show offline UI initially.\\" into nyc-mr1-dev am:
2373aaafc6
am:
3cdd348434
Change-Id: I66041ea6397b11ad7be3ae948d1ec18a302410d9
Fan Zhang [Thu, 23 Jun 2016 17:38:23 +0000 (17:38 +0000)]
Merge \"Display operation hours when support is closed.\" into nyc-mr1-dev
am:
c3a0a18f77
Change-Id: I85feefab029eeb7e7101ec7f25e28d3653b07852
Fan Zhang [Thu, 23 Jun 2016 17:38:20 +0000 (17:38 +0000)]
Merge \"Bug fix: support tab doesn\'t show offline UI initially.\" into nyc-mr1-dev
am:
2373aaafc6
Change-Id: I226b76f8d69ff25327c9043609bb923a13feab7b
Fan Zhang [Thu, 23 Jun 2016 17:27:10 +0000 (17:27 +0000)]
Merge "Display operation hours when support is closed." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 17:25:22 +0000 (17:25 +0000)]
Merge "Bug fix: support tab doesn't show offline UI initially." into nyc-mr1-dev
Fan Zhang [Thu, 23 Jun 2016 15:38:00 +0000 (08:38 -0700)]
Bug fix: support tab doesn't show offline UI initially.
Bug:
29601818
The support UI correctly monitors network state change after being
displayed, but it fails to set initial hasInternet flag. So we
manually refresh this flag as part of onResume.
Change-Id: Icbf3cca708a961390073cfa77ec08bec7dd4d82f
TreeHugger Robot [Thu, 23 Jun 2016 11:33:24 +0000 (11:33 +0000)]
Merge "Fix crash when setting a password/pattern from private fragment"
Clara Bayarri [Thu, 23 Jun 2016 10:11:42 +0000 (11:11 +0100)]
Fix crash when setting a password/pattern from private fragment
As of N+, we don't allow the addition of private fragments as this
causes problems with Configuration Change recreations.
Bug:
29565251
Change-Id: I6a4cf1011e1a4e6ba308565e010a51d2992e79e2
Andrew Sapperstein [Thu, 23 Jun 2016 03:00:57 +0000 (03:00 +0000)]
Merge \\"Flip default value for nav key setting.\\" into nyc-mr1-dev am:
742047f565
am:
a513e0e046
Change-Id: I2f95a89e47a7176678bc2eb563ff7cdf4a48ff68
Andrew Sapperstein [Thu, 23 Jun 2016 02:58:17 +0000 (02:58 +0000)]
Merge \"Flip default value for nav key setting.\" into nyc-mr1-dev
am:
742047f565
Change-Id: Id8aeaac79e142f81daecde2379e36ed77c0ba14c
TreeHugger Robot [Thu, 23 Jun 2016 02:51:44 +0000 (02:51 +0000)]
Merge "Flip default value for nav key setting." into nyc-mr1-dev
Daniel Nishi [Thu, 23 Jun 2016 01:51:32 +0000 (01:51 +0000)]
Re-add a string to fix a build breakage. am:
be42f8bb61
am:
e91548ab38
Change-Id: I6986367b31361d74e0efbd41d79da735cd555c24
Daniel Nishi [Thu, 23 Jun 2016 01:48:55 +0000 (01:48 +0000)]
Re-add a string to fix a build breakage.
am:
be42f8bb61
Change-Id: I569479a635f407427a1877724d25101dde77602f
Daniel Nishi [Thu, 23 Jun 2016 01:41:04 +0000 (18:41 -0700)]
Re-add a string to fix a build breakage.
Change-Id: I079a5643634ffbf68f9414c639a9aba4a8a67d75
Andrew Sapperstein [Thu, 23 Jun 2016 01:04:50 +0000 (18:04 -0700)]
Flip default value for nav key setting.
It's on by default.
BUG:
28565958
BUG:
29550614
Change-Id: I3bec47f9f495bfec946f09d314407e6b48672b0a
Andrew Sapperstein [Thu, 23 Jun 2016 00:37:46 +0000 (00:37 +0000)]
Merge \\"Flip default values of two gesture settings.\\" into nyc-mr1-dev am:
399251a0e7
am:
1dbb1fb6e7
Change-Id: Iab366f210e11718b5735c90a7a6e6ee74510d824
Andrew Sapperstein [Thu, 23 Jun 2016 00:35:07 +0000 (00:35 +0000)]
Merge \"Flip default values of two gesture settings.\" into nyc-mr1-dev
am:
399251a0e7
Change-Id: Ifeb432500939cee04201b3ea464f84d2a269b970
Andrew Sapperstein [Thu, 23 Jun 2016 00:29:25 +0000 (00:29 +0000)]
Merge "Flip default values of two gesture settings." into nyc-mr1-dev
Jack Yu [Thu, 23 Jun 2016 00:11:19 +0000 (17:11 -0700)]
Added multi sim support back for brazil channel 50 messages.
Reverted the MSIM removeal CL ag/825835.
bug:
28787384
Change-Id: I2f3691a83c117c2f01a78788d6e95e51a314d51f
Meng Wang [Thu, 23 Jun 2016 00:10:37 +0000 (00:10 +0000)]
Merge \\"WifiCallingSettings: UI improvement\\" into nyc-mr1-dev am:
d70ebc7bc4
am:
50a4f6b690
Change-Id: I69c9885fc94a4dbe283497eb8b3bd1e23f6055a1
Meng Wang [Thu, 23 Jun 2016 00:07:10 +0000 (00:07 +0000)]
Merge \"WifiCallingSettings: UI improvement\" into nyc-mr1-dev
am:
d70ebc7bc4
Change-Id: I717bf769eb87112f46c0a4d01c212794212036af
OSDN Git Service
