Nicolas Prévot
e000022872
Merge \"Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 1ba2cbbfc2\" into nyc-mr1-dev-plus-aosp
...
am: a48e7e767b
2016-06-13 12:58:28 +00:00
Nicolas Prevot
7f8c6354ac
Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 341b21d2f8
...
am: 21693422b4
2016-06-13 12:58:28 +00:00
Android Build Merger (Role)
a48e7e767b
Merge "Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495 am: 1ba2cbbfc2" into nyc-mr1-dev-plus-aosp
2016-06-13 12:54:55 +00:00
Nicolas Prévot
88555d92ee
Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495
...
am: 1ba2cbbfc2
2016-06-13 12:54:43 +00:00
Nicolas Prévot
21693422b4
Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495
...
am: 341b21d2f8
2016-06-13 12:54:36 +00:00
Nicolas Prevot
341b21d2f8
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
...
am: 98704bc495
2016-06-13 12:50:16 +00:00
Nicolas Prevot
1ba2cbbfc2
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
...
am: 98704bc495
2016-06-13 12:50:11 +00:00
Nicolas Prévot
98704bc495
Merge "Fix rendering of policy transparency activity." into nyc-dev
2016-06-13 12:37:05 +00:00
Ruchi Kandoi
5c1a19c573
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp am: f8c135a986
...
am: 2fda09ad85
2016-06-11 05:22:06 +00:00
Mark Salyzyn
2fda09ad85
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
am: f8c135a986
2016-06-11 05:18:20 +00:00
Ruchi Kandoi
f8c135a986
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
2016-06-10 22:04:52 -07:00
Bill Yi
edeca513bc
Import translations. DO NOT MERGE am: c66bffa31f -s ours am: 099609af97 -s ours
...
am: c7e9bfd2b8
2016-06-11 04:51:33 +00:00
Bill Yi
87d06026d8
Import translations. DO NOT MERGE am: c66bffa31f -s ours am: b99a48f779 -s ours
...
am: 6cffc3f8ba
2016-06-11 04:47:46 +00:00
Bill Yi
c7e9bfd2b8
Import translations. DO NOT MERGE am: c66bffa31f -s ours
...
am: 099609af97
2016-06-11 04:47:45 +00:00
Bill Yi
6cffc3f8ba
Import translations. DO NOT MERGE am: c66bffa31f -s ours
...
am: b99a48f779
2016-06-11 04:44:01 +00:00
Bill Yi
b99a48f779
Import translations. DO NOT MERGE
...
am: c66bffa31f
2016-06-11 04:40:07 +00:00
Bill Yi
099609af97
Import translations. DO NOT MERGE
...
am: c66bffa31f
2016-06-11 04:40:07 +00:00
Anna Galusza
db0dbef52b
Remove "Help & feedback" from toggle screen for accessibility services to
...
prevent confusion when users are trying to submit feedback for a specific
accessibility service (accessibility services can place their own "Help &
feedabck" in their apks and route it appropriately).
Bug: 29278252
Change-Id: Ie6f0d92a9ded82eaf3a0ac1122861f26639bc58a
2016-06-10 23:40:11 +00:00
Mark Salyzyn
9e28f9a7f7
Merge \"Settings: add logpersist selection (actions)\"
...
am: 3c398ea710
2016-06-10 22:50:23 +00:00
Treehugger Robot
3c398ea710
Merge "Settings: add logpersist selection (actions)"
2016-06-10 22:37:55 +00:00
Mark Salyzyn
03af2286ee
Settings: add logpersist selection (actions)
...
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-06-10 21:44:32 +00:00
Bill Yi
c66bffa31f
Import translations. DO NOT MERGE
...
Change-Id: I1e7bce31415e722131d6127fc7534669ce527d37
Auto-generated-cl: translation import
2016-06-10 13:49:23 -07:00
Meng Wang
95dd0323a6
Merge \\"Wi-Fi Calling settings UI update\\" into nyc-mr1-dev am: 7648de1ec6
...
am: 9b345526b7
2016-06-10 16:44:28 +00:00
Meng Wang
9b345526b7
Merge \"Wi-Fi Calling settings UI update\" into nyc-mr1-dev
...
am: 7648de1ec6
2016-06-10 16:42:25 +00:00
Meng Wang
7648de1ec6
Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev
2016-06-10 16:36:46 +00:00
Jason Monk
47fb7da7e1
Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 3078e76284
...
am: 36045d1e9c
2016-06-10 15:17:21 +00:00
Jason Monk
2f40b22d41
Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 0fa8dc1b55
...
am: 4d86173586
2016-06-10 15:17:20 +00:00
Jason Monk
36045d1e9c
Merge \\"Fix crash in finish from onCreate.\\" into nyc-dev am: 1a1f6b0b1b
...
am: 3078e76284
2016-06-10 15:14:33 +00:00
Jason Monk
4d86173586
Merge \\"Fix crash in finish from onCreate.\\" into nyc-dev am: 1a1f6b0b1b
...
am: 0fa8dc1b55
2016-06-10 15:14:09 +00:00
Jason Monk
3078e76284
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
...
am: 1a1f6b0b1b
2016-06-10 15:11:24 +00:00
Jason Monk
0fa8dc1b55
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
...
am: 1a1f6b0b1b
2016-06-10 15:11:24 +00:00
TreeHugger Robot
1a1f6b0b1b
Merge "Fix crash in finish from onCreate." into nyc-dev
2016-06-10 15:06:34 +00:00
Jason Monk
656bc6004f
Fix crash in finish from onCreate.
...
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324
2016-06-10 09:49:12 -04:00
Yohei Yukawa
38f2bca7b3
Merge \\\"Fix sentence capitalization of locale names.\\\" into nyc-dev am: 294b1586ed am: 74358619a0
...
am: e82ff5251e
2016-06-10 00:28:27 +00:00
Yohei Yukawa
a34a2b955b
Merge \\\"Fix sentence capitalization of locale names.\\\" into nyc-dev am: 294b1586ed am: 2d1d002eea
...
am: effed5adc0
2016-06-10 00:28:26 +00:00
Yohei Yukawa
e82ff5251e
Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am: 294b1586ed
...
am: 74358619a0
2016-06-10 00:02:58 +00:00
Yohei Yukawa
effed5adc0
Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am: 294b1586ed
...
am: 2d1d002eea
2016-06-10 00:02:38 +00:00
Yohei Yukawa
74358619a0
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
...
am: 294b1586ed
2016-06-09 23:57:58 +00:00
Yohei Yukawa
2d1d002eea
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
...
am: 294b1586ed
2016-06-09 23:57:58 +00:00
Yohei Yukawa
294b1586ed
Merge "Fix sentence capitalization of locale names." into nyc-dev
2016-06-09 23:47:31 +00:00
Roozbeh Pournader
55e6e16e48
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
...
am: c553faaa00
2016-06-09 23:15:46 +00:00
Roozbeh Pournader
833444d7d2
Merge \\\"Use existing localizations for formatting data usage [DO NOT MERGE]\\\" into nyc-dev am: 5eddc4bde9 am: 0e3b675446
...
am: ab69ab599e
2016-06-09 23:15:45 +00:00
Android Build Merger (Role)
c553faaa00
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
2016-06-09 23:09:52 +00:00
Roozbeh Pournader
4ee474a0b4
Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am: 5eddc4bde9
...
am: 241f8e6e9c
2016-06-09 23:09:45 +00:00
Roozbeh Pournader
ab69ab599e
Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am: 5eddc4bde9
...
am: 0e3b675446
2016-06-09 23:09:30 +00:00
Roozbeh Pournader
0e3b675446
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
...
am: 5eddc4bde9
2016-06-09 23:07:09 +00:00
Roozbeh Pournader
241f8e6e9c
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
...
am: 5eddc4bde9
2016-06-09 23:06:55 +00:00
Svet Ganov
3ef56bd3f9
Merge \\\"Don\\\'t send user to permissions screen if none requested\\\" into nyc-dev am: 3e5318496e am: 0984141943
...
am: f977f45ac0
2016-06-09 23:05:21 +00:00
Svet Ganov
9de3e13f50
Merge \\\"Don\\\'t send user to permissions screen if none requested\\\" into nyc-dev am: 3e5318496e am: 650cc723d1
...
am: 1fb5f435cf
2016-06-09 23:05:21 +00:00
Roozbeh Pournader
5eddc4bde9
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
2016-06-09 23:04:22 +00:00
