Commit Graph

280604 Commits

Author SHA1 Message Date
Raph Levien
f476409eb1 Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev am: e7ab3e1650 am: ddc50bb7d9
am: 7ed925511b

Change-Id: Ic3b24969885a3df3e153edf15788d3b32c3cea48
2016-08-23 15:46:34 +00:00
Raph Levien
82ff7b62a5 Update lint check to accommodate new emoji sequences am: 0790ac68bc am: b1581dbbfd
am: 2ec19e2c2d

Change-Id: I42fc46567eeb0afbbb91914e4444763181ad089c
2016-08-23 15:46:28 +00:00
Randy Pan
20fee324d0 Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev am: dd056b9422 am: 69f7492184
am: b75288da83

Change-Id: I12a1bd493a32a2254806ab3991115e3612aa6486
2016-08-23 15:34:25 +00:00
Randy Pan
8ca720430c Deprecate QNS network disable reason BAD_LINK am: 7d82f98b8f am: 1f7453e79c
am: 87d17cf3b9

Change-Id: Ic71bd79b9f1921bc062299b0fcca3e9ecf3f74be
2016-08-23 15:33:50 +00:00
Makoto Onuki
aa00a3c148 Merge "Off-load unlocking users onto a worker thread" into nyc-mr1-dev am: 8b47748b9c am: 9594d78a45
am: 35fbf7ef7b

Change-Id: I1314bbdbe8c6528a91049c6f3ee0b4e73d3b238a
2016-08-23 15:33:44 +00:00
Makoto Onuki
977c69b87d Off-load unlocking users onto a worker thread am: 085a05cd86 am: 035cfcd21d
am: 7269ef4c1e

Change-Id: I10e4743cd949c62ca184cca07f18c3592c4d5cbb
2016-08-23 15:33:41 +00:00
Bill Yi
9a1bb744ae Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a6ec65edab -s ours am: 125d6479a0 -s ours
am: 36a073171b  -s ours

Change-Id: I079edeca0fd49d916e4b79268b9dc815a633a254
2016-08-23 15:33:36 +00:00
Bill Yi
985a20973a Import translations. DO NOT MERGE am: 653c88ed61 -s ours am: 85755a910e -s ours
am: b822ba8991  -s ours

Change-Id: I7e982ab6d827b248fb5b9b4a7f044a1b8bf6d6ed
2016-08-23 15:25:41 +00:00
Bill Yi
c9cab7cac6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8aea3746cd -s ours am: d6e2c3ff06 -s ours
am: a30f7f0873  -s ours

Change-Id: I136071593d37752d379591c15139514f37597b9a
2016-08-23 15:25:38 +00:00
Bill Yi
4d5cc8b902 Import translations. DO NOT MERGE am: 225d865289 -s ours am: a5b32eb046 -s ours
am: 4b58f12d0b  -s ours

Change-Id: I3abf18dcb440f8311d831cf86fee37c2f48790fe
2016-08-23 15:25:35 +00:00
Bill Yi
52ec40fed6 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c341e0b571 -s ours am: b19043ff85 -s ours
am: d38f89d2ef  -s ours

Change-Id: I6dca3be87beca2c284a7e93b89b9a3dff5d910e6
2016-08-23 15:25:32 +00:00
Bill Yi
2d70dd9afb Import translations. DO NOT MERGE am: 8ac0dbea72 -s ours am: 71cd2b8449 -s ours
am: 7f3b0055b7  -s ours

Change-Id: I6e4467192d5fccc71ddf1b2c6a06674a2ecf1c24
2016-08-23 15:25:29 +00:00
Bill Yi
e28b3796e5 Import translations. DO NOT MERGE am: f71553f601 -s ours am: e8fd4589f1 -s ours
am: 5ab46fec66  -s ours

Change-Id: Ia7f107f25f79f7c4e3534edd2176611706d5faaa
2016-08-23 15:17:09 +00:00
Erik Kline
6a63183784 Merge "Ensure known good state when starting." into nyc-mr1-dev am: e845cf22c1 am: 31ef78878e
am: 4efa787038

Change-Id: Iac79f90b2d884357186ed99cf764da40afbb25d9
2016-08-23 15:17:04 +00:00
Erik Kline
0beb547d35 Ensure known good state when starting. am: 703b0974e0 am: 226db19739
am: 14700c87b0

Change-Id: I3b5a460cea3fdb4d60c25a2550037de32f8b1b74
2016-08-23 15:17:01 +00:00
Sailesh Nepal
9888be7259 Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-mr1-dev am: 5647c93e9e am: 7aaa861cd7
am: 45f2310a88

Change-Id: I6c9d43905efbad7f980434e7027ae9a95b11f3e2
2016-08-23 15:16:57 +00:00
Sailesh Nepal
de6aeaae7e resolve merge conflicts of ad31603 to cw-f-dev am: bbfb97461d
am: cb5bce5c76

Change-Id: I75a2e6c5f9d6759e495081a3e9e71c515f08e027
2016-08-23 15:16:52 +00:00
Sailesh Nepal
1f4c966710 Merge "resolve merge conflicts of 2cff241 to master" 2016-08-23 15:13:04 +00:00
Julius D'souza
1e62337cea Merge "Add dynamic illuminance hysteresis support" 2016-08-23 15:10:31 +00:00
Sailesh Nepal
607c51aadb resolve merge conflicts of 2cff241 to master
Change-Id: Ide7a24bb36c51a24bd4107c3042efc3117ea76f6
2016-08-23 08:10:12 -07:00
Raph Levien
7ed925511b Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev am: e7ab3e1650
am: ddc50bb7d9

Change-Id: I8d78147b79e57a69dac679f4e571f3dc815932b1
2016-08-23 14:53:16 +00:00
Raph Levien
2ec19e2c2d Update lint check to accommodate new emoji sequences am: 0790ac68bc
am: b1581dbbfd

Change-Id: I17b2989e1ee0477991705d15e0324a449da69c1a
2016-08-23 14:53:06 +00:00
Randy Pan
b75288da83 Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev am: dd056b9422
am: 69f7492184

Change-Id: I6711a9fac55cbc20f8f7f3511200e4f668334752
2016-08-23 14:45:26 +00:00
Randy Pan
87d17cf3b9 Deprecate QNS network disable reason BAD_LINK am: 7d82f98b8f
am: 1f7453e79c

Change-Id: I187eac64a1b7b2582a5b0ce2b5d8775bbb1299a9
2016-08-23 14:44:20 +00:00
Makoto Onuki
35fbf7ef7b Merge "Off-load unlocking users onto a worker thread" into nyc-mr1-dev am: 8b47748b9c
am: 9594d78a45

Change-Id: I612522eb78c92f9eb677049aaef61728318256ca
2016-08-23 14:44:14 +00:00
Makoto Onuki
7269ef4c1e Off-load unlocking users onto a worker thread am: 085a05cd86
am: 035cfcd21d

Change-Id: Ie19ee16803beb4f11011ea5833c9a80dc22d82d7
2016-08-23 14:44:11 +00:00
Bill Yi
36a073171b Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a6ec65edab -s ours
am: 125d6479a0  -s ours

Change-Id: Ic316efc26417c8915b4531b17d632b5b05a88d62
2016-08-23 14:44:07 +00:00
Bill Yi
b822ba8991 Import translations. DO NOT MERGE am: 653c88ed61 -s ours
am: 85755a910e  -s ours

Change-Id: I7990c75216b72ed76a7fe10aa0ecc590acc2da0e
2016-08-23 14:44:04 +00:00
Bill Yi
a30f7f0873 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 8aea3746cd -s ours
am: d6e2c3ff06  -s ours

Change-Id: Ie89dab313c94a48e20d5094acd740ebd7fbcee72
2016-08-23 14:35:25 +00:00
Bill Yi
4b58f12d0b Import translations. DO NOT MERGE am: 225d865289 -s ours
am: a5b32eb046  -s ours

Change-Id: Ib2379f9ca6b32ee0aee79084cf105a0d7dcd6401
2016-08-23 14:35:21 +00:00
Bill Yi
d38f89d2ef Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c341e0b571 -s ours
am: b19043ff85  -s ours

Change-Id: Ideb32bda0a357e2f92a895770ac7f717984ebd77
2016-08-23 14:35:18 +00:00
Bill Yi
7f3b0055b7 Import translations. DO NOT MERGE am: 8ac0dbea72 -s ours
am: 71cd2b8449  -s ours

Change-Id: Iabc086baba62887c4c8f619d8b59b4e66b9fba47
2016-08-23 14:35:15 +00:00
Julius D'souza
428aed01e1 Add dynamic illuminance hysteresis support
Bug: 18572096

Change-Id: Ie0ff1990b8f4a3d435328834871f04a6e2bd5e97
2016-08-23 07:32:51 -07:00
Bill Yi
5ab46fec66 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 7a944b3e5c -s ours
am: 99c97f5fb4  -s ours

Change-Id: I3e7fa778fcf551e16500950cffad895da228888f
2016-08-23 14:32:19 +00:00
Bill Yi
4efa787038 Import translations. DO NOT MERGE am: f71553f601 -s ours
am: e8fd4589f1  -s ours

Change-Id: I8b094a9a7b49b0397285d08ee6d550c829c3d3d3
2016-08-23 14:32:15 +00:00
Erik Kline
14700c87b0 Merge "Ensure known good state when starting." into nyc-mr1-dev am: e845cf22c1
am: 31ef78878e

Change-Id: I29381e3438229a0d628a6017cd8bf143c55457f3
2016-08-23 14:32:12 +00:00
Erik Kline
45f2310a88 Ensure known good state when starting. am: 703b0974e0
am: 226db19739

Change-Id: I9193adfa93d3de8b3a9ddfcb73814a938814ee63
2016-08-23 14:32:09 +00:00
Sailesh Nepal
cb5bce5c76 Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-mr1-dev am: 5647c93e9e
am: 7aaa861cd7

Change-Id: Ibffd6c32c383039e6d066533d65e5531740fe06a
2016-08-23 14:32:04 +00:00
Raph Levien
ddc50bb7d9 Merge "Update lint check to accommodate new emoji sequences" into nyc-mr1-dev
am: e7ab3e1650

Change-Id: Iee7e2e454c63afbcd20f93e1a534c5f595f16101
2016-08-23 14:30:13 +00:00
Raph Levien
b1581dbbfd Update lint check to accommodate new emoji sequences
am: 0790ac68bc

Change-Id: Id179440ba304c40c498555389deb7b9cad7dcd9f
2016-08-23 14:30:08 +00:00
Randy Pan
69f7492184 Merge "Deprecate QNS network disable reason BAD_LINK" into nyc-mr1-dev
am: dd056b9422

Change-Id: Id8e4b7666b0ff65ced28a4b53ff85dbba5a1ae17
2016-08-23 14:30:00 +00:00
Randy Pan
1f7453e79c Deprecate QNS network disable reason BAD_LINK
am: 7d82f98b8f

Change-Id: Ic3a92aaed8a56cf61c6bd100811bafb009613daa
2016-08-23 14:29:35 +00:00
Makoto Onuki
9594d78a45 Merge "Off-load unlocking users onto a worker thread" into nyc-mr1-dev
am: 8b47748b9c

Change-Id: I63ef0697035803b1d4caf3a5dd67e6e68791696b
2016-08-23 14:29:19 +00:00
Makoto Onuki
035cfcd21d Off-load unlocking users onto a worker thread
am: 085a05cd86

Change-Id: I85994decc805888099fc97bcb34119468a48a4f4
2016-08-23 14:29:12 +00:00
Bill Yi
125d6479a0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: a6ec65edab  -s ours

Change-Id: I65b4042f322910f40767c05eea10dc4aaf171160
2016-08-23 14:29:01 +00:00
Bill Yi
85755a910e Import translations. DO NOT MERGE
am: 653c88ed61  -s ours

Change-Id: I74b015207a3d0d2b42739558326cb50a1e852a99
2016-08-23 14:28:56 +00:00
Bill Yi
d6e2c3ff06 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 8aea3746cd  -s ours

Change-Id: I1d30271721ea9549ad66d3230d54dee67713f2e1
2016-08-23 14:22:54 +00:00
Bill Yi
a5b32eb046 Import translations. DO NOT MERGE
am: 225d865289  -s ours

Change-Id: Ibd4000f14a836183b386b6bf95a284e280431a65
2016-08-23 14:22:52 +00:00
Bill Yi
b19043ff85 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: c341e0b571  -s ours

Change-Id: I08fa4baa8902af90ef3d0009b4ae451da0437803
2016-08-23 14:22:49 +00:00
Bill Yi
71cd2b8449 Import translations. DO NOT MERGE
am: 8ac0dbea72  -s ours

Change-Id: I9d87c670c819ddaff3162b1c0f0189245db2274f
2016-08-23 14:22:47 +00:00