OSDN Git Service
Jason Monk [Fri, 10 Jun 2016 15:14:33 +0000 (15:14 +0000)]
Merge \\"Fix crash in finish from onCreate.\\" into nyc-dev am:
1a1f6b0b1b
am:
3078e76284
Change-Id: I8f58b14d3011209fc0d02c14a44476f13af4338c
Jason Monk [Fri, 10 Jun 2016 15:14:09 +0000 (15:14 +0000)]
Merge \\"Fix crash in finish from onCreate.\\" into nyc-dev am:
1a1f6b0b1b
am:
0fa8dc1b55
Change-Id: I3b89d3ea39ea415645aaff57471aa4e0fd439ff3
Jason Monk [Fri, 10 Jun 2016 15:11:24 +0000 (15:11 +0000)]
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am:
1a1f6b0b1b
Change-Id: I8c4a6902f6fcf0510b2a307ca3fe7e918f9702f9
Jason Monk [Fri, 10 Jun 2016 15:11:24 +0000 (15:11 +0000)]
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am:
1a1f6b0b1b
Change-Id: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72
TreeHugger Robot [Fri, 10 Jun 2016 15:06:34 +0000 (15:06 +0000)]
Merge "Fix crash in finish from onCreate." into nyc-dev
Jason Monk [Fri, 10 Jun 2016 13:49:12 +0000 (09:49 -0400)]
Fix crash in finish from onCreate.
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes:
29245324
Yohei Yukawa [Fri, 10 Jun 2016 00:02:58 +0000 (00:02 +0000)]
Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am:
294b1586ed
am:
74358619a0
Change-Id: I72b0e49afcbac5aa44609df9b25318aacc89bdc5
Yohei Yukawa [Fri, 10 Jun 2016 00:02:38 +0000 (00:02 +0000)]
Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am:
294b1586ed
am:
2d1d002eea
Change-Id: Ia25f22558a97a3ba961b877403ce931fc13e6db0
Yohei Yukawa [Thu, 9 Jun 2016 23:57:58 +0000 (23:57 +0000)]
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am:
294b1586ed
Change-Id: Id61473c100565d9d795bf314ccff6723bdd0c64c
Yohei Yukawa [Thu, 9 Jun 2016 23:57:58 +0000 (23:57 +0000)]
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am:
294b1586ed
Change-Id: I66b2876c923eed55804e14edc9f73ad619157336
Yohei Yukawa [Thu, 9 Jun 2016 23:47:31 +0000 (23:47 +0000)]
Merge "Fix sentence capitalization of locale names." into nyc-dev
Android Build Merger (Role) [Thu, 9 Jun 2016 23:09:52 +0000 (23:09 +0000)]
Merge "Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am:
5eddc4bde9 am:
241f8e6e9c" into nyc-mr1-dev-plus-aosp
Roozbeh Pournader [Thu, 9 Jun 2016 23:09:45 +0000 (23:09 +0000)]
Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am:
5eddc4bde9
am:
241f8e6e9c
Change-Id: Ide8afd402be0454b080ea91766f95c6ecf4c7570
Roozbeh Pournader [Thu, 9 Jun 2016 23:09:30 +0000 (23:09 +0000)]
Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am:
5eddc4bde9
am:
0e3b675446
Change-Id: I4058ac8826ca1ce6c903d862e3246b86e6071113
Roozbeh Pournader [Thu, 9 Jun 2016 23:07:09 +0000 (23:07 +0000)]
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am:
5eddc4bde9
Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7
Roozbeh Pournader [Thu, 9 Jun 2016 23:06:55 +0000 (23:06 +0000)]
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am:
5eddc4bde9
Change-Id: If18910dba402d98ffc115af8c87b836fca50ec0f
Roozbeh Pournader [Thu, 9 Jun 2016 23:04:21 +0000 (23:04 +0000)]
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
Svetoslav Ganov [Thu, 9 Jun 2016 23:02:04 +0000 (23:02 +0000)]
Merge \\"Don\\'t send user to permissions screen if none requested\\" into nyc-dev am:
3e5318496e
am:
0984141943
Change-Id: Iaf17b055c1efdd18eaf44f6dbee188aa8eecfe89
Svetoslav Ganov [Thu, 9 Jun 2016 22:58:26 +0000 (22:58 +0000)]
Merge \\"Don\\'t send user to permissions screen if none requested\\" into nyc-dev am:
3e5318496e
am:
650cc723d1
Change-Id: I7c2309f8ccc006cf0b37e5dce6bb75bef927b747
Svet Ganov [Thu, 9 Jun 2016 22:53:40 +0000 (22:53 +0000)]
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am:
3e5318496e
Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d
Svet Ganov [Thu, 9 Jun 2016 22:53:07 +0000 (22:53 +0000)]
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am:
3e5318496e
Change-Id: I6060ae5a113025b0cfbbd8ff1f58599cb8f4cf7e
Svetoslav Ganov [Thu, 9 Jun 2016 22:45:49 +0000 (22:45 +0000)]
Merge "Don't send user to permissions screen if none requested" into nyc-dev
Yohei Yukawa [Thu, 9 Jun 2016 22:01:52 +0000 (15:01 -0700)]
Fix sentence capitalization of locale names.
It turns out that out previous CL [1] is not sufficient to address all
the requests regarding capitalization.
With [1], now InputMethodSubtype#getLocaleDisplayName() returns a locale
name whose capitalization is basically optimized to be used as a list
item. It works well for list UI, but on a UI element that looks like a
sentence text, we still need to capitalize the first character.
This CL takes care of those UI elements in the Settings app. This CL
also addresses a remaining TODO about locale-unaware text formatting by
using about android.icu.text.ListFormatter.
[1]: If105082ce703db7a86738455db7e9fb37f3c6fe8
e489baf96df2837a3a63b626d9023a4a8b322c28
Bug:
29035638
Change-Id: I59f93f0bc067cdd87c6065c972a7da3cde1128f9
Roozbeh Pournader [Thu, 9 Jun 2016 04:55:09 +0000 (21:55 -0700)]
Use existing localizations for formatting data usage [DO NOT MERGE]
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.
Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.
Bug:
28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
Mark Salyzyn [Thu, 9 Jun 2016 20:23:05 +0000 (20:23 +0000)]
Merge \\\"Settings: add logpersist selection (strings)\\\" am:
99afd4a87d am:
540ebc39ac -s ours
am:
1f9e0cce2b
Change-Id: I146e9e96a7c076528cf7d1da419ff79e2cba9ef6
Mark Salyzyn [Thu, 9 Jun 2016 20:18:14 +0000 (20:18 +0000)]
Merge \\"Settings: add logpersist selection (strings)\\" am:
99afd4a87d
am:
540ebc39ac -s ours
Change-Id: I00cbd8cbbb926afccd664239c6064747c96c0142
Mark Salyzyn [Thu, 9 Jun 2016 19:46:46 +0000 (19:46 +0000)]
Merge \"Settings: add logpersist selection (strings)\"
am:
99afd4a87d
Change-Id: I45d09fc05d11ce1dac413896706b4a7e4e11a8ba
Mark Salyzyn [Thu, 9 Jun 2016 19:38:31 +0000 (19:38 +0000)]
Merge "Settings: add logpersist selection (strings)"
Mark Salyzyn [Fri, 3 Jun 2016 21:05:05 +0000 (14:05 -0700)]
Settings: add logpersist selection (strings)
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.
Bug:
28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
Svet Ganov [Thu, 9 Jun 2016 05:32:07 +0000 (22:32 -0700)]
Don't send user to permissions screen if none requested
bug:
29105157
Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
Bill Yi [Thu, 9 Jun 2016 14:12:01 +0000 (14:12 +0000)]
Import translations. DO NOT MERGE am:
b43b49c643 -s ours
am:
483ca13e0b -s ours
Change-Id: I37ab0d635c2d40d7ed0cb488d5365030d3ff5a26
Bill Yi [Thu, 9 Jun 2016 14:11:57 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
de2559e136 -s ours
Change-Id: I192c5d7d64d9a3941489b230fd4ea7bb2cc46a9f
Bill Yi [Thu, 9 Jun 2016 14:03:33 +0000 (14:03 +0000)]
Import translations. DO NOT MERGE am:
b43b49c643 -s ours
am:
9190e13af2 -s ours
Change-Id: Ie62ae11869123b06d62021565fc75ad0613d31b3
Bill Yi [Thu, 9 Jun 2016 14:00:04 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
b43b49c643 -s ours
Change-Id: Ia865b8f152d756c2180b15a2a9de0a667817ab62
Bill Yi [Thu, 9 Jun 2016 14:00:04 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
b43b49c643 -s ours
Change-Id: Ibb7f8a46f201ab267cbb1833608d10b4512babf2
Bill Yi [Thu, 9 Jun 2016 05:54:47 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80bce4c08874414f732d26ada50825c7b8140322
Auto-generated-cl: translation import
Bill Yi [Thu, 9 Jun 2016 05:38:29 +0000 (22:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b3039eadee367f4839682567022826320d208e0
Auto-generated-cl: translation import
Android Build Merger (Role) [Wed, 8 Jun 2016 21:39:55 +0000 (21:39 +0000)]
Merge "Merge \"Moved network settings reset away from Backup & reset.\" into nyc-mr1-dev am:
ab595b8a98" into nyc-mr1-dev-plus-aosp
Doris Ling [Wed, 8 Jun 2016 21:39:46 +0000 (21:39 +0000)]
Merge \"Moved network settings reset away from Backup & reset.\" into nyc-mr1-dev
am:
ab595b8a98
Change-Id: I96a3150e617322e3e39e82d578b20d8d2f558554
Jason Monk [Wed, 8 Jun 2016 21:39:45 +0000 (21:39 +0000)]
Fix build
am:
feee247e0c
Change-Id: Id39d7798827dade57e89da9cfa2e387f4b37c29c
Doris Ling [Wed, 8 Jun 2016 21:35:19 +0000 (21:35 +0000)]
Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev
Jason Monk [Wed, 8 Jun 2016 20:09:03 +0000 (16:09 -0400)]
Fix build
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit
e3ce6713d30e1fef2b081211af91d223c4c29692)
Jason Monk [Wed, 8 Jun 2016 20:22:18 +0000 (20:22 +0000)]
resolve merge conflicts of
7f7092c to nyc-mr1-dev
am:
aaaa236cec
Change-Id: Ib4ee0ed91ac5951f67698ddc459bc0031eed3160
Jason Monk [Wed, 8 Jun 2016 20:19:35 +0000 (16:19 -0400)]
resolve merge conflicts of
7f7092c to nyc-mr1-dev
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
Jason Monk [Wed, 8 Jun 2016 19:28:48 +0000 (15:28 -0400)]
resolve merge conflicts of
167f6cc to nyc-mr1-dev-plus-aosp
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
Jason Monk [Wed, 8 Jun 2016 19:26:48 +0000 (19:26 +0000)]
Merge \\"Fix data usage format strings\\" into nyc-dev am:
cb1972b908
am:
2c7e1d844f
Change-Id: I7240bac72b08c251bf90c433d4febe5e8f725f4b
Jason Monk [Wed, 8 Jun 2016 19:26:17 +0000 (19:26 +0000)]
Merge \\"Fix disabling of tiles that are not relevant\\" into nyc-dev am:
9c5d3164f5
am:
4db5484a9d
Change-Id: I1fc083fbb9057a610acc52f5453fd9a3e7c2607f
Jason Monk [Wed, 8 Jun 2016 19:15:42 +0000 (19:15 +0000)]
Merge \"Remove PreferenceActivity\" into nyc-dev
am:
7f7092c705
Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
Jason Monk [Wed, 8 Jun 2016 19:15:42 +0000 (19:15 +0000)]
Merge \"Fix data usage format strings\" into nyc-dev
am:
cb1972b908
Change-Id: I42ae51bb815f24b026ff0c25759634b23d13355c
Jason Monk [Wed, 8 Jun 2016 19:15:41 +0000 (19:15 +0000)]
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
am:
9c5d3164f5
Change-Id: I778f8f766ace689b1bd4174000daaafb13253516
Jason Monk [Wed, 8 Jun 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Remove PreferenceActivity" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:51 +0000 (19:11 +0000)]
Merge "Fix data usage format strings" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
Doris Ling [Wed, 8 Jun 2016 00:56:00 +0000 (17:56 -0700)]
Moved network settings reset away from Backup & reset.
Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.
Bug:
28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
Felipe Leme [Wed, 8 Jun 2016 16:17:18 +0000 (16:17 +0000)]
Merge \"Display total storage for Internal shared storage.\" into nyc-mr1-dev
am:
d4e31320c1
Change-Id: I0a4c996177ecc57352af4b6be244af7b9e09b1d2
TreeHugger Robot [Wed, 8 Jun 2016 16:08:11 +0000 (16:08 +0000)]
Merge "Display total storage for Internal shared storage." into nyc-mr1-dev
Ricky Wai [Wed, 8 Jun 2016 15:00:54 +0000 (15:00 +0000)]
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am:
68c263cf2e
am:
5f0e81222a
Change-Id: I11576bc92d1b3f80780efb4d46d963eea2176de7
Ricky Wai [Wed, 8 Jun 2016 14:54:14 +0000 (14:54 +0000)]
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am:
68c263cf2e
am:
263b210c16
Change-Id: I9e606761dc2c3e88832aeac2e8ddd65f0c7677f7
Felipe Leme [Wed, 11 May 2016 20:58:41 +0000 (13:58 -0700)]
Display total storage for Internal shared storage.
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".
This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.
BUG:
24128505
Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1
** Cherrypicked from master - DO NOT MERGE **
Ricky Wai [Wed, 8 Jun 2016 14:49:06 +0000 (14:49 +0000)]
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am:
68c263cf2e
Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2
Ricky Wai [Wed, 8 Jun 2016 14:47:43 +0000 (14:47 +0000)]
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am:
68c263cf2e
Change-Id: I40ee4bef616c6dbff872f5bb106b3195a9e5be07
Ricky Wai [Wed, 8 Jun 2016 14:34:02 +0000 (14:34 +0000)]
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 13:49:21 +0000 (13:49 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
09cedc44b4 -s ours
am:
6a9133f5b5 -s ours
Change-Id: Ie22147e143bbe55942bb2a69277b83bad3cc2ba7
Jason Monk [Mon, 6 Jun 2016 20:01:58 +0000 (16:01 -0400)]
Remove PreferenceActivity
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes:
28779941
Baligh Uddin [Wed, 8 Jun 2016 13:42:46 +0000 (13:42 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
09cedc44b4 -s ours
am:
edb4c9c153 -s ours
Change-Id: I3a461596a23d7d7de0960db5e0827f917a2d0e65
Baligh Uddin [Wed, 8 Jun 2016 13:36:23 +0000 (13:36 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
09cedc44b4 -s ours
Change-Id: I1af6c2584397a29d5128eea7cdcfb8d8c9c8e0a7
Baligh Uddin [Wed, 8 Jun 2016 13:36:05 +0000 (13:36 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
09cedc44b4 -s ours
Change-Id: I33f0f1c5bb67c375eac16b2619934c55dcabb504
Ricky Wai [Tue, 7 Jun 2016 15:54:25 +0000 (16:54 +0100)]
Make work challenge settings work even work profile is not enabled yet
Bug:
29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
Baligh Uddin [Wed, 8 Jun 2016 13:09:21 +0000 (13:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Wed, 8 Jun 2016 04:21:26 +0000 (21:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c
Jim Miller [Wed, 8 Jun 2016 00:45:39 +0000 (00:45 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
f8c64089b1
am:
6233c1d0bc
Change-Id: Id028fa650c62da4ce71bde9282ae8219997579b0
Jim Miller [Wed, 8 Jun 2016 00:43:55 +0000 (00:43 +0000)]
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am:
f8c64089b1
am:
5b9fab40a0
Change-Id: I055b5b61daf626c05dbac11c59da3453cc08d43e
Jim Miller [Wed, 8 Jun 2016 00:38:35 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
f8c64089b1
Change-Id: Idf719bc91baba5fe18c044183794da4a74251bdd
Jim Miller [Wed, 8 Jun 2016 00:38:29 +0000 (00:38 +0000)]
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am:
f8c64089b1
Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8
TreeHugger Robot [Wed, 8 Jun 2016 00:31:28 +0000 (00:31 +0000)]
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
Jim Miller [Tue, 7 Jun 2016 22:44:46 +0000 (15:44 -0700)]
Move legacy full disk encryption code to Settings.
Fixes bug
27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
Jason Monk [Tue, 7 Jun 2016 18:02:33 +0000 (14:02 -0400)]
Fix disabling of tiles that are not relevant
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes:
29080209
Bill Yi [Tue, 7 Jun 2016 03:39:09 +0000 (03:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ca24281df8 -s ours
* commit '
ca24281df88030a6fb3e1c2b3fd104a78c8506b8':
Import translations. DO NOT MERGE
Change-Id: Ic21cfb870060f52e88d7c224599adfc22561fcfe
Bill Yi [Tue, 7 Jun 2016 03:37:14 +0000 (03:37 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
48229d7781 -s ours
am:
f12e2ee361 -s ours
* commit '
f12e2ee361e4973a858d6b0e31c9b3c7a54045ed':
Change-Id: I3c809004b464b7532610850aeae2299271672e4a
TreeHugger Robot [Tue, 7 Jun 2016 03:35:54 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 7 Jun 2016 03:33:59 +0000 (03:33 +0000)]
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
Bill Yi [Tue, 7 Jun 2016 03:31:23 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
48229d7781 -s ours
* commit '
48229d77817bbf4c169787bef8faddd77bf890a1':
Import translations. DO NOT MERGE
Change-Id: I736dc40ed3a5ba94a145779a30ab8e21b1ee601a
Bill Yi [Tue, 7 Jun 2016 03:31:21 +0000 (03:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
48229d7781 -s ours
* commit '
48229d77817bbf4c169787bef8faddd77bf890a1':
Import translations. DO NOT MERGE
Change-Id: Ia9398ea959de34c41ecdf48f47bdf433dd25bf65
TreeHugger Robot [Tue, 7 Jun 2016 03:23:12 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 7 Jun 2016 02:03:01 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ife628ac799a79648619b9d52df5ec0da1287281d
Auto-generated-cl: translation import
Bill Yi [Tue, 7 Jun 2016 01:48:05 +0000 (18:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
Robin Lee [Mon, 6 Jun 2016 21:22:07 +0000 (21:22 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev am:
8f2c17e12c
am:
e8fce6d433
* commit '
e8fce6d4332e3ee4000d9efb548f5de3bbadb4a8':
Change-Id: I4ce9abb873d9480d1d83f29d39b03f0d8447a710
Robin Lee [Mon, 6 Jun 2016 21:12:27 +0000 (21:12 +0000)]
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
Robin Lee [Mon, 6 Jun 2016 21:09:30 +0000 (21:09 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev
am:
8f2c17e12c
* commit '
8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
Restrict Settings always-on to NYC+
Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf
Robin Lee [Mon, 6 Jun 2016 21:09:29 +0000 (21:09 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev
am:
8f2c17e12c
* commit '
8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
Restrict Settings always-on to NYC+
Change-Id: Icdd13f90ce7c38b8d3fdc4f5b5247f97f6a21127
Robin Lee [Mon, 6 Jun 2016 20:59:00 +0000 (20:59 +0000)]
Merge "Restrict Settings always-on to NYC+" into nyc-dev
Jason Monk [Mon, 6 Jun 2016 20:39:55 +0000 (16:39 -0400)]
Fix data usage format strings
Bug:
28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
Robin Lee [Mon, 23 May 2016 15:32:47 +0000 (16:32 +0100)]
Restrict Settings always-on to NYC+
Bug:
28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
Bill Yi [Fri, 3 Jun 2016 23:33:31 +0000 (23:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
edafefc1ed -s ours
am:
e2b9a2bd87 -s ours
* commit '
e2b9a2bd87310556cc3d0aee40fbc60d22c49954':
Change-Id: I0ca7aa83ed5af62a846a5f494b66bab0e4869896
Jason Monk [Fri, 3 Jun 2016 23:33:31 +0000 (23:33 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev am:
8c5dccc6bf
am:
2cd2074f7f
* commit '
2cd2074f7f20eeb3de52743dc2733eae25762ffe':
Change-Id: Ie2e2b4997c643421c5f53f3c46f91fe26ebf41dc
Andrew Sapperstein [Fri, 3 Jun 2016 23:29:53 +0000 (23:29 +0000)]
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
Bill Yi [Fri, 3 Jun 2016 23:29:52 +0000 (23:29 +0000)]
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
Jason Monk [Fri, 3 Jun 2016 23:29:51 +0000 (23:29 +0000)]
Merge "Fix accidental non-translatable string" into nyc-dev am:
8c5dccc6bf
am:
8a1d371239
* commit '
8a1d371239ec88bb85c38c2f484625d401a5ed8e':
Fix accidental non-translatable string
Change-Id: Ic637ea0a09b49d250b80690094a5cd21ba31d236
Andrew Sapperstein [Fri, 3 Jun 2016 22:22:37 +0000 (22:22 +0000)]
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
Bill Yi [Fri, 3 Jun 2016 22:21:49 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
edafefc1ed -s ours
* commit '
edafefc1edb806b0a4f350b656c4f08f5c3d90e7':
Import translations. DO NOT MERGE
Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4
OSDN Git Service
