Ian Rogers
d7b28f70b0
Merge "Fix sort orders on longs."
2016-06-07 15:49:50 +00:00
Ian Rogers
03936cea60
Fix sort orders on longs.
...
The int conversion narrows a long possibly inverting its sign. This may
lead to broken comparator sort orders.
Caught by Error Prone.
Bug: 27723540
Change-Id: I53d70c25a22cdcfc496443395b170f586d259fa7
2016-06-07 00:02:42 -07:00
Bill Yi
6304854536
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ca24281df8
-s ours
...
am: bf986bb7d0
-s ours
* commit 'bf986bb7d0777d191e14b6019fcb3d86c7405e28':
Import translations. DO NOT MERGE
Change-Id: Ib008a4de5e4e607df3d553436367f66027570d42
2016-06-07 03:39:37 +00:00
Bill Yi
e0848b3b9a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781
-s ours am: f12e2ee361
-s ours
...
am: 1ee6221214
-s ours
* commit '1ee6221214a14665ddb2ed38a2abdd509491d964':
Change-Id: I4ff08b3d33046f3c93b5952db2ff2c66f57051e1
2016-06-07 03:39:36 +00:00
Bill Yi
bf986bb7d0
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: ca24281df8
-s ours
* commit 'ca24281df88030a6fb3e1c2b3fd104a78c8506b8':
Import translations. DO NOT MERGE
Change-Id: Ic21cfb870060f52e88d7c224599adfc22561fcfe
2016-06-07 03:39:09 +00:00
Bill Yi
1ee6221214
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781
-s ours
...
am: f12e2ee361
-s ours
* commit 'f12e2ee361e4973a858d6b0e31c9b3c7a54045ed':
Change-Id: I3c809004b464b7532610850aeae2299271672e4a
2016-06-07 03:37:14 +00:00
Bill Yi
3e333ee4e3
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781
-s ours am: e145cca1d0
-s ours
...
am: c6da591a08
-s ours
* commit 'c6da591a0854d0f5e725bd531ffac2b349c518d2':
Import translations. DO NOT MERGE
Change-Id: I81f5cfada627d2a1440d504820bca3b2fcdac874
2016-06-07 03:36:35 +00:00
TreeHugger Robot
ca24281df8
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-07 03:35:54 +00:00
Bill Yi
c6da591a08
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781
-s ours
...
am: e145cca1d0
-s ours
* commit 'e145cca1d0ad7856220b2bcab7a7d6771439b536':
Import translations. DO NOT MERGE
Change-Id: Ia396c589077bc718ed2ccd366a10efde0bc93ca8
2016-06-07 03:33:59 +00:00
Bill Yi
f12e2ee361
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 48229d7781
-s ours
* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
Import translations. DO NOT MERGE
Change-Id: I736dc40ed3a5ba94a145779a30ab8e21b1ee601a
2016-06-07 03:31:23 +00:00
Bill Yi
e145cca1d0
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 48229d7781
-s ours
* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
Import translations. DO NOT MERGE
Change-Id: Ia9398ea959de34c41ecdf48f47bdf433dd25bf65
2016-06-07 03:31:21 +00:00
TreeHugger Robot
48229d7781
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-07 03:23:12 +00:00
TreeHugger Robot
d5029246f8
Merge "Import translations. DO NOT MERGE"
2016-06-07 02:30:16 +00:00
Bill Yi
937c29d240
Import translations. DO NOT MERGE
...
Change-Id: Ife628ac799a79648619b9d52df5ec0da1287281d
Auto-generated-cl: translation import
2016-06-06 19:03:01 -07:00
Bill Yi
d4bd56b2a7
Import translations. DO NOT MERGE
...
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
2016-06-06 18:48:05 -07:00
Bill Yi
fad556056d
Import translations. DO NOT MERGE
...
Change-Id: I8cb13150fc08e94cd42c7426695b694ec5eda94f
Auto-generated-cl: translation import
2016-06-06 18:06:54 -07:00
Meng Wang
0dc4311333
Wi-Fi Calling settings UI update
...
Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
2016-06-06 16:49:02 -07:00
Robin Lee
527acd7b01
Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c
am: e8fce6d433
...
am: a47ec95e73
* commit 'a47ec95e73741a86d64340654b7a920c46b5f441':
Change-Id: Ie708472a950d86631905a03da174d389aaec73ac
2016-06-06 21:24:40 +00:00
Robin Lee
a47ec95e73
Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c
...
am: e8fce6d433
* commit 'e8fce6d4332e3ee4000d9efb548f5de3bbadb4a8':
Change-Id: I4ce9abb873d9480d1d83f29d39b03f0d8447a710
2016-06-06 21:22:07 +00:00
Robin Lee
971a19b7d3
Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c
am: cff703e68a
...
am: dbf70ca4ab
* commit 'dbf70ca4abc559588c0be94032e7ad3708ca5e9c':
Restrict Settings always-on to NYC+
Change-Id: I692e8fc589d8ff2d474d9a22fd27500f6f207cd1
2016-06-06 21:14:59 +00:00
Robin Lee
dbf70ca4ab
Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c
...
am: cff703e68a
* commit 'cff703e68a156593412b906f7845c66906f23149':
Restrict Settings always-on to NYC+
Change-Id: Ic60a75f6694dcb51c7d3ed398bf644b7ed1108b6
2016-06-06 21:12:27 +00:00
Robin Lee
e8fce6d433
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
Restrict Settings always-on to NYC+
Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf
2016-06-06 21:09:30 +00:00
Robin Lee
cff703e68a
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
Restrict Settings always-on to NYC+
Change-Id: Icdd13f90ce7c38b8d3fdc4f5b5247f97f6a21127
2016-06-06 21:09:29 +00:00
Robin Lee
8f2c17e12c
Merge "Restrict Settings always-on to NYC+" into nyc-dev
2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c
Fix data usage format strings
...
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1
Restrict Settings always-on to NYC+
...
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Bill Yi
d404ee401a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed
-s ours am: e2b9a2bd87
-s ours
...
am: ce51385f29
-s ours
* commit 'ce51385f29bd1bf2316de0bac2feeb9cc798c91e':
Change-Id: I70c600bafdda7d1fc0e7d17283026c80a8edd406
2016-06-04 00:24:24 +00:00
Jason Monk
493cbe1b21
Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf
am: 2cd2074f7f
...
am: 7adbeba736
* commit '7adbeba736318d698ce1acfa3f740828a63f834b':
Change-Id: I5748b54fecc9c8ee3e5e640d5510c0bb89dbd341
2016-06-04 00:24:24 +00:00
Andrew Sapperstein
905ab6b743
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev am: 6c52398695
...
am: 66fb65b867
* commit '66fb65b867dcbb00276b5104228e9b5a82da8c90':
Add safety & regulatory info to "about device".
Change-Id: I2ef8b0e7efc702d8652c5f6bf6e8be7e4d9e21df
2016-06-04 00:24:23 +00:00
Bill Yi
7b04f56164
Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed
-s ours am: 1f055cb81d
-s ours
...
am: c90e7685ca
-s ours
* commit 'c90e7685ca86ae0f7eec8abb661e69b16a0561eb':
Import translations. DO NOT MERGE
Change-Id: Ia2f0c20ed0eb85f2de4b61b6a38e436bae94bbbb
2016-06-04 00:24:23 +00:00
Jason Monk
152a7072af
Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf
am: 8a1d371239
...
am: f7d775c3d6
* commit 'f7d775c3d6a699eab12efed7a54f68165d805a64':
Fix accidental non-translatable string
Change-Id: I2e003723d8b778fda71a36e4077e491777149467
2016-06-04 00:24:22 +00:00
Bill Yi
ce51385f29
Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed
-s ours
...
am: e2b9a2bd87
-s ours
* commit 'e2b9a2bd87310556cc3d0aee40fbc60d22c49954':
Change-Id: I0ca7aa83ed5af62a846a5f494b66bab0e4869896
2016-06-03 23:33:31 +00:00
Jason Monk
7adbeba736
Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf
...
am: 2cd2074f7f
* commit '2cd2074f7f20eeb3de52743dc2733eae25762ffe':
Change-Id: Ie2e2b4997c643421c5f53f3c46f91fe26ebf41dc
2016-06-03 23:33:31 +00:00
Andrew Sapperstein
66fb65b867
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
...
am: 6c52398695
* commit '6c52398695164aeba6c3ad8ebc8047ffe98805df':
Add safety & regulatory info to "about device".
Change-Id: I7feb228f842a1697c2e3c56bfb6c1dcb0694c9b5
2016-06-03 23:29:53 +00:00
Bill Yi
c90e7685ca
Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed
-s ours
...
am: 1f055cb81d
-s ours
* commit '1f055cb81d40e4c2460c4421a44e1c9251a1313c':
Import translations. DO NOT MERGE
Change-Id: I7010a07cedd23ac9ae5f2bcebab8b6b20e60803e
2016-06-03 23:29:52 +00:00
Jason Monk
f7d775c3d6
Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf
...
am: 8a1d371239
* commit '8a1d371239ec88bb85c38c2f484625d401a5ed8e':
Fix accidental non-translatable string
Change-Id: Ic637ea0a09b49d250b80690094a5cd21ba31d236
2016-06-03 23:29:51 +00:00
Andrew Sapperstein
6c52398695
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
2016-06-03 22:22:38 +00:00
Bill Yi
1f055cb81d
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: edafefc1ed
-s ours
* commit 'edafefc1edb806b0a4f350b656c4f08f5c3d90e7':
Import translations. DO NOT MERGE
Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4
2016-06-03 22:21:49 +00:00
Jason Monk
8a1d371239
Merge "Fix accidental non-translatable string" into nyc-dev
...
am: 8c5dccc6bf
* commit '8c5dccc6bf05397cf4c51ce88d561fecbebba059':
Fix accidental non-translatable string
Change-Id: I71c42ccd2daca0801263809edb36eb4d175d444a
2016-06-03 22:21:47 +00:00
Bill Yi
e2b9a2bd87
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: edafefc1ed
-s ours
* commit 'edafefc1edb806b0a4f350b656c4f08f5c3d90e7':
Import translations. DO NOT MERGE
Change-Id: I534c3d6e54efda539b6f246161f70328b5ff7916
2016-06-03 21:08:44 +00:00
Jason Monk
2cd2074f7f
Merge "Fix accidental non-translatable string" into nyc-dev
...
am: 8c5dccc6bf
* commit '8c5dccc6bf05397cf4c51ce88d561fecbebba059':
Fix accidental non-translatable string
Change-Id: I27dbea3833ed4e8c491a26da676da4b4e02696ca
2016-06-03 21:06:10 +00:00
Bill Yi
7340ea57fd
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 6c3dac1f89
-s ours
...
am: f36b989635
-s ours
* commit 'f36b98963525aa96e6334f59ce83c3090cc186ce':
Import translations. DO NOT MERGE
Change-Id: Ib9a30be17b0c9b24803b16e57648a75e40db4c11
2016-06-03 19:41:51 +00:00
Bill Yi
f36b989635
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 6c3dac1f89
-s ours
* commit '6c3dac1f89ee770a02b369be6dcc94135ce4e24a':
Import translations. DO NOT MERGE
Change-Id: I1f8ddda3dc29c7f14a77e25960b749c8d4a772c4
2016-06-03 19:33:29 +00:00
TreeHugger Robot
edafefc1ed
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 19:22:57 +00:00
TreeHugger Robot
6c3dac1f89
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-03 19:18:31 +00:00
Jason Monk
8c5dccc6bf
Merge "Fix accidental non-translatable string" into nyc-dev
2016-06-03 19:12:09 +00:00
Jason Monk
18b603f84f
Fix accidental non-translatable string
...
Bug: 29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
2016-06-03 15:06:56 -04:00
Sanket Agarwal
9936e92160
Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92
am: e1fa67c165
am: 083ba3cc2a
...
am: 7b54a93fe3
* commit '7b54a93fe34aad7c73cafcee56066d2b5b52e30d':
Handle return value when Bluetooth is enabled
Change-Id: I5c51b32431452a2ef79ba29e7f285fd880182364
2016-06-03 18:54:30 +00:00
Sanket Agarwal
7b54a93fe3
Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92
am: e1fa67c165
...
am: 083ba3cc2a
* commit '083ba3cc2ac3494ab8e03cd2303f454e3a57d6ab':
Handle return value when Bluetooth is enabled
Change-Id: I340b8c78b23061e7c74ba47b1ab016332c0ee903
2016-06-03 18:34:18 +00:00
Sanket Agarwal
083ba3cc2a
Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92
...
am: e1fa67c165
* commit 'e1fa67c165ab7f1475ca4fc89be4e98dafa68a1d':
Handle return value when Bluetooth is enabled
Change-Id: I2446e2ab09eb061be09fafc73ed71e10dadd47ab
2016-06-03 18:01:45 +00:00