Felipe Leme
2af22b9324
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
...
am: 8c3b5fa3cf
* commit '8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
Added title for stand-alone App Data Usage activitiy.
Change-Id: If2d8f9673af0150d8a2a10aa0d0f9de0c17f4161
2016-05-09 20:05:42 +00:00
Felipe Leme
2318d40fc3
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
...
am: 8c3b5fa3cf
* commit '8c3b5fa3cf14efa3677a3c6cc666900503c15ea0':
Added title for stand-alone App Data Usage activitiy.
Change-Id: Ifb78da77b270aab297ba67037a85a37cc26a769a
2016-05-09 20:05:38 +00:00
Fan Zhang
bc4118c849
Merge "Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605
am: 3bfe967e5c" into nyc-mr1-dev-plus-aosp
...
am: 80c8bbd004
* commit '80c8bbd00449e1d26874c8b6b3f644b648e3e550':
Change-Id: Id97548fd6e31066a4326486f754cf9b01e5ec463
2016-05-09 19:58:58 +00:00
Fan Zhang
34c1f09b05
Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605
am: 8f834a10e0
...
am: 0638e943d5
* commit '0638e943d5b7a31390e3cef835affa40895dcccb':
Fix crash when rotating screen in a few screens.
Change-Id: Idff4d69f9618a193712e4a9f2d17646a3b461585
2016-05-09 19:58:58 +00:00
Android Build Merger (Role)
80c8bbd004
Merge "Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605
am: 3bfe967e5c" into nyc-mr1-dev-plus-aosp
2016-05-09 19:53:50 +00:00
Fan Zhang
03a626b750
Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605
...
am: 3bfe967e5c
* commit '3bfe967e5cab5ddd3d14cebdfd07075d48577082':
Fix crash when rotating screen in a few screens.
Change-Id: I238c48dfa3e78f1c42f4f96de88afb33ab28761d
2016-05-09 19:53:39 +00:00
Fan Zhang
0638e943d5
Merge "Fix crash when rotating screen in a few screens." into nyc-dev am: 2728874605
...
am: 8f834a10e0
* commit '8f834a10e083df651a3f003e248d58eaacae99ce':
Fix crash when rotating screen in a few screens.
Change-Id: I62a625e0a51e6adda598aa911125a65484358155
2016-05-09 19:53:38 +00:00
TreeHugger Robot
8c3b5fa3cf
Merge "Added title for stand-alone App Data Usage activitiy." into nyc-dev
2016-05-09 19:50:11 +00:00
Fan Zhang
8f834a10e0
Merge "Fix crash when rotating screen in a few screens." into nyc-dev
...
am: 2728874605
* commit '2728874605ef6dc19c901c39663d04c7087e8cda':
Fix crash when rotating screen in a few screens.
Change-Id: Ie31ea933c19597c73b5454fe944dca751435550e
2016-05-09 19:48:22 +00:00
Fan Zhang
3bfe967e5c
Merge "Fix crash when rotating screen in a few screens." into nyc-dev
...
am: 2728874605
* commit '2728874605ef6dc19c901c39663d04c7087e8cda':
Fix crash when rotating screen in a few screens.
Change-Id: I5fa56a9910016e76d30a845fa4578f07eb2229e5
2016-05-09 19:48:22 +00:00
Fan Zhang
2728874605
Merge "Fix crash when rotating screen in a few screens." into nyc-dev
2016-05-09 19:39:58 +00:00
Bill Yi
79734661e3
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea
-s ours am: 7cebc5dbda
-s ours
...
am: 424103ed15
-s ours
* commit '424103ed15f40993792af786af71171034196e42':
Change-Id: Idb2c36ed37200fe297eb88c122b230c154bf336a
2016-05-09 18:44:05 +00:00
Bill Yi
dbaac9b363
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea
-s ours am: 3bb61fec65
-s ours
...
am: c86d7e5e92
-s ours
* commit 'c86d7e5e92b4cc418bb21585712f9d23dcc4cda8':
Import translations. DO NOT MERGE
Change-Id: Iaa0223354334a884b3d6dd418ec0c26621f9c0e9
2016-05-09 18:44:04 +00:00
Bill Yi
424103ed15
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea
-s ours
...
am: 7cebc5dbda
-s ours
* commit '7cebc5dbda02c5969c2039f0f64db60c4b350839':
Change-Id: Ied6fcfc4440020abaf09421279f3076e17c57cd4
2016-05-09 18:36:45 +00:00
Bill Yi
c86d7e5e92
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 43a4e5f4ea
-s ours
...
am: 3bb61fec65
-s ours
* commit '3bb61fec65643f7d686975b228bb67fd6d47a328':
Import translations. DO NOT MERGE
Change-Id: I1ba1290fd79d538a77c599c1b55404ac4c4689c0
2016-05-09 18:35:42 +00:00
Bill Yi
632040ffb0
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4e5641bfa8
-s ours
...
am: 8805cb80bb
-s ours
* commit '8805cb80bbaf7a0008689bee2777f881947c4b8c':
Import translations. DO NOT MERGE
Change-Id: Icf3e1a4cda82619ab0f24ea803909f898feb14ba
2016-05-09 18:33:54 +00:00
Bill Yi
3bb61fec65
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 43a4e5f4ea
-s ours
* commit '43a4e5f4eaae8a3c886a7f9e66707f8253fecfdb':
Import translations. DO NOT MERGE
Change-Id: I769df4f22077bfe74817edace2cd20cb51bc200d
2016-05-09 18:29:41 +00:00
Bill Yi
7cebc5dbda
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 43a4e5f4ea
-s ours
* commit '43a4e5f4eaae8a3c886a7f9e66707f8253fecfdb':
Import translations. DO NOT MERGE
Change-Id: I7ba01b3156de2044a05491d88a98681449edf94c
2016-05-09 18:29:34 +00:00
Bill Yi
8805cb80bb
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: 4e5641bfa8
-s ours
* commit '4e5641bfa8a27bbcd377e68e2d52d163ddec3011':
Import translations. DO NOT MERGE
Change-Id: I861e2d9156422593779e301b24809bde271d28f5
2016-05-09 18:28:26 +00:00
TreeHugger Robot
3fcedd44c8
Merge "Import translations. DO NOT MERGE"
2016-05-09 18:18:52 +00:00
TreeHugger Robot
43a4e5f4ea
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-09 18:17:36 +00:00
TreeHugger Robot
4e5641bfa8
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-09 18:17:33 +00:00
Sudheer Shanka
2ad6adbd58
Add policy transparency to app notification settings on lockscreen.
...
Bug: 28390118
Change-Id: I395440b0f7e93da90f9f346574afa5501761d473
2016-05-09 10:57:34 -07:00
Fan Zhang
016f875ae7
Fix crash when rotating screen in a few screens.
...
Bug: 26946312
Fixed in the following screens:
Apps > Gear > Special Access > Modify system settings
Apps > Gear > Special Access > Draw over other apps
Apps > Gear > Special Access > Apps with usage access
Language & input > Personal dictionary
Wireless & networks (More) > Android Beam
Change-Id: I0b9bd6c19f710302625dd87989e9d4ce3c96a9a2
2016-05-09 17:56:06 +00:00
Felipe Leme
785f294d04
Added title for stand-alone App Data Usage activitiy.
...
Change-Id: I031085e6a3c058ed55dfdfe3e7cfecf5a21dddc5
Fixes: 28615889
2016-05-09 10:34:39 -07:00
Victor Chang
f5b2fea636
Show a different Root CA string for device owner
...
Bug: 28627835
Change-Id: Iab750dbe7099336b664ef66892cbf2c1b89a9e8e
2016-05-09 16:41:45 +01:00
Jason Monk
5ae52c8dd5
Merge "Merge "Dashboard performance work" into nyc-dev am: 04b25af149
am: 4a36e0b3fc" into nyc-mr1-dev-plus-aosp
...
am: 30b6336d3a
* commit '30b6336d3a69842ef5a12c022a7bfa8aa2b31eb1':
Change-Id: Ib3a0996c35ea2ffc498d31ac0e93782a0eec36d2
2016-05-09 13:48:48 +00:00
Jason Monk
572b3c82fc
Merge "Dashboard performance work" into nyc-dev am: 04b25af149
am: 96eedcfdd2
...
am: fc5f0d4d20
* commit 'fc5f0d4d20817112d7d8d101f245ba50d45728e8':
Dashboard performance work
Change-Id: I5daad812baf80d27ea6cf097bea15065fa581a7b
2016-05-09 13:48:48 +00:00
Android Build Merger (Role)
30b6336d3a
Merge "Merge "Dashboard performance work" into nyc-dev am: 04b25af149
am: 4a36e0b3fc" into nyc-mr1-dev-plus-aosp
2016-05-09 13:44:53 +00:00
Jason Monk
fc5f0d4d20
Merge "Dashboard performance work" into nyc-dev am: 04b25af149
...
am: 96eedcfdd2
* commit '96eedcfdd24a0cda4a56843a55f448367e8518c8':
Dashboard performance work
Change-Id: Ifdb7fa74850c8a4a217ed9f706b2bc3cdcad9be4
2016-05-09 13:44:38 +00:00
Jason Monk
4674a5597e
Merge "Dashboard performance work" into nyc-dev am: 04b25af149
...
am: 4a36e0b3fc
* commit '4a36e0b3fccb9ebf29582aa1eb22ba47078540ae':
Dashboard performance work
Change-Id: I66492092477f36e46d792f2b512af25374a2273d
2016-05-09 13:44:37 +00:00
Jason Monk
4a36e0b3fc
Merge "Dashboard performance work" into nyc-dev
...
am: 04b25af149
* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
Dashboard performance work
Change-Id: Ib85705ab2984d6b8229181709a762dfbcf6341c0
2016-05-09 13:40:55 +00:00
Jason Monk
96eedcfdd2
Merge "Dashboard performance work" into nyc-dev
...
am: 04b25af149
* commit '04b25af149ba8e4c38cfe17fe9caf246a598e8e3':
Dashboard performance work
Change-Id: I41c9443c997428924b5ef6df2ad632c06bd416a8
2016-05-09 13:40:54 +00:00
Jason Monk
04b25af149
Merge "Dashboard performance work" into nyc-dev
2016-05-09 13:37:45 +00:00
Bill Yi
40225b58db
Import translations. DO NOT MERGE
...
Change-Id: Ia72b6a7cc7ef24d407953bdfec981ac8a08d48de
Auto-generated-cl: translation import
2016-05-09 06:29:08 -07:00
Bill Yi
bb5730df59
Import translations. DO NOT MERGE
...
Change-Id: I6e9f10288cb94440b0f46bd5405ed996168efcbf
Auto-generated-cl: translation import
2016-05-09 06:22:15 -07:00
Bill Yi
4a71402d20
Import translations. DO NOT MERGE
...
Change-Id: Ia3c6b7eb2e6df55f64c39452680a455ef923c33c
Auto-generated-cl: translation import
2016-05-09 05:30:41 -07:00
Felipe Leme
d4e0d7c379
Merge "Implemented onRestrictPowerChanged()." into nyc-dev am: f135ad5186
am: c36f19e26f
...
am: f62ba989bc
* commit 'f62ba989bcb0077de002dd3361a4e936d2e2b273':
Change-Id: Id1cd0cc87081d7d78c565e7f848928e64d5ab269
2016-05-07 05:35:42 +00:00
Jason Monk
d6a5803c20
Merge "Fix accessibility description on master clear" into nyc-dev am: c12521cdcc
am: d682839f62
...
am: 237741a335
* commit '237741a3353cc073292e197ff4fdd254b02ced51':
Change-Id: Ie811cdce2bc3fb939022c1d856a6c057c89a648c
2016-05-07 05:35:41 +00:00
Victor Chang
9d9a39a44a
Merge "TrustCredentials listview should be expanded by default" into nyc-dev am: 963c3a4e9f
am: 0d16f639bc
...
am: 717898646d
* commit '717898646d7d3588b02d1897dd745d3954f65c17':
Change-Id: Id308d61abc574b8c5f072f9b199031a216ada604
2016-05-07 05:35:40 +00:00
Bill Yi
99f8380202
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df
-s ours am: 35fb0fb796
-s ours
...
am: 6e936b232a
-s ours
* commit '6e936b232a8869aca7e8f48c6a429ccf87b74143':
Change-Id: Ia87f041802994f10c6f00aa0748bd8fb7266abf1
2016-05-07 05:35:39 +00:00
Clara Bayarri
f953f69f4e
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am: 2540d66bfe
am: da66986223
...
am: 1931308353
* commit '1931308353a5ed16390829cf7f3461a026252e2d':
Change-Id: If20ea382fa02bf64232603e3bf5eaaa970e7bce3
2016-05-07 05:35:37 +00:00
Felipe Leme
f62ba989bc
Merge "Implemented onRestrictPowerChanged()." into nyc-dev am: f135ad5186
...
am: c36f19e26f
* commit 'c36f19e26f7268b642b6de96b43de7a21ad50ef0':
Change-Id: Id6c8a1505aaa049f2003208a460e7648a8f3f990
2016-05-07 05:32:59 +00:00
Jason Monk
237741a335
Merge "Fix accessibility description on master clear" into nyc-dev am: c12521cdcc
...
am: d682839f62
* commit 'd682839f62257521c123bfa02ba0163eeaf02f73':
Change-Id: I0ef0f6ba8d094e092c18fadfb490942478a4cd37
2016-05-07 05:32:58 +00:00
Robin Lee
717898646d
Merge "TrustCredentials listview should be expanded by default" into nyc-dev am: 963c3a4e9f
...
am: 0d16f639bc
* commit '0d16f639bc530980835ed242a36f2dba526c0b7b':
Change-Id: Idec602687cea9c047b4c39ae7ddfbb74ace13e60
2016-05-07 05:32:57 +00:00
Bill Yi
6e936b232a
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7f1b86e5df
-s ours
...
am: 35fb0fb796
-s ours
* commit '35fb0fb796a3a055002962ee0e1dced5b1e2f856':
Change-Id: If95b92b560dcd97280a1dcd009df87c8786316df
2016-05-07 05:32:56 +00:00
Clara Bayarri
1931308353
Merge "Remove invisible object in A11y Settings screens\' menu" into nyc-dev am: 2540d66bfe
...
am: da66986223
* commit 'da6698622346ff9171d464422ba2662571551c22':
Change-Id: If2e2ea61506a725d11c529b231fae9018e80ab96
2016-05-07 05:32:54 +00:00
Pavlin Radoslavov
c3865601e8
resolve merge conflicts of 8fa3d44
to nyc-mr1-dev am: 3d4a586b80
...
am: 86f77ab1e2
* commit '86f77ab1e2287f0221d35aef445592815d8d54ce':
Change-Id: Iab9627f1771abad8357b062816ce30ff8c49f76b
2016-05-07 05:32:50 +00:00
Felipe Leme
c36f19e26f
Merge "Implemented onRestrictPowerChanged()." into nyc-dev
...
am: f135ad5186
* commit 'f135ad5186377bb2525b644c09db92b1d9171656':
Implemented onRestrictPowerChanged().
Change-Id: I936f603cd3feade0c821d0d17814b11317106a31
2016-05-07 05:30:12 +00:00
Jason Monk
d682839f62
Merge "Fix accessibility description on master clear" into nyc-dev
...
am: c12521cdcc
* commit 'c12521cdccb14f9f1bd623902d010090ebffc5d4':
Fix accessibility description on master clear
Change-Id: I81313191558700095f6812392cc29c3b655a464a
2016-05-07 05:30:11 +00:00