OSDN Git Service
Daniel Nishi [Thu, 21 Apr 2016 16:38:33 +0000 (16:38 +0000)]
Merge "Fix a whitespace issue in ManageApplications."
Jason Monk [Thu, 21 Apr 2016 16:05:09 +0000 (16:05 +0000)]
Merge "Merge "Screen saver string fixes" into nyc-dev am:
990ef94b64 am:
80f32e1dce" into nyc-mr1-dev-plus-aosp
am:
6f05fd0d25
* commit '
6f05fd0d250b1e48af3c48836cb516b2366316ce':
Change-Id: Ib8074c5190942a764c05b041df2bddd91b97b401
Jason Monk [Thu, 21 Apr 2016 16:05:08 +0000 (16:05 +0000)]
Merge "Screen saver string fixes" into nyc-dev am:
990ef94b64 am:
fcc592c6ac
am:
5d8c95d931
* commit '
5d8c95d9310abf6339c349c2c97542cc53a7e553':
Screen saver string fixes
Change-Id: Ie59a721675ecc6f6bf8404136350b058d04caa2c
Android Build Merger (Role) [Thu, 21 Apr 2016 16:00:35 +0000 (16:00 +0000)]
Merge "Merge "Screen saver string fixes" into nyc-dev am:
990ef94b64 am:
80f32e1dce" into nyc-mr1-dev-plus-aosp
Jason Monk [Thu, 21 Apr 2016 16:00:27 +0000 (16:00 +0000)]
Merge "Screen saver string fixes" into nyc-dev am:
990ef94b64
am:
80f32e1dce
* commit '
80f32e1dce8015d29fe920acb13e40dcf8518693':
Screen saver string fixes
Change-Id: Ia9be0152b34a91c7173db5ff78138278d2085aa7
Jason Monk [Thu, 21 Apr 2016 16:00:25 +0000 (16:00 +0000)]
Merge "Screen saver string fixes" into nyc-dev am:
990ef94b64
am:
fcc592c6ac
* commit '
fcc592c6ac60402642ebebc7317ecf28293a0f7a':
Screen saver string fixes
Change-Id: I83b1657abcce0ed9cc685f36bbd95eab4bb390ba
Jason Monk [Thu, 21 Apr 2016 15:58:01 +0000 (15:58 +0000)]
Merge "Screen saver string fixes" into nyc-dev
am:
990ef94b64
* commit '
990ef94b646f6d38fa8a44ee26f211014969e08e':
Screen saver string fixes
Change-Id: I4286c726e1faa245860cd038ae037c88a5efc72f
Jason Monk [Thu, 21 Apr 2016 15:58:00 +0000 (15:58 +0000)]
Merge "Screen saver string fixes" into nyc-dev
am:
990ef94b64
* commit '
990ef94b646f6d38fa8a44ee26f211014969e08e':
Screen saver string fixes
Change-Id: Ie86b8e3c7478f8f7013ed3c61eaee5d9d6c500b2
Jason Monk [Thu, 21 Apr 2016 15:55:27 +0000 (15:55 +0000)]
Merge "Screen saver string fixes" into nyc-dev
Jason Monk [Thu, 21 Apr 2016 15:50:58 +0000 (11:50 -0400)]
Screen saver string fixes
Change-Id: I609509787e5f7f9f03eb0e478ab358fe930b0678
Fixes:
28268243
Keith Cheung [Thu, 21 Apr 2016 15:44:52 +0000 (15:44 +0000)]
Merge "Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878 am:
43effe8441" into nyc-mr1-dev-plus-aosp
am:
96deee3522
* commit '
96deee3522d03bf0b174a226c0f67eca607ae575':
Change-Id: I576648c71c5c32923d5565d987bc27e39df0f484
Keith Cheung [Thu, 21 Apr 2016 15:44:51 +0000 (15:44 +0000)]
Merge "Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878 am:
43effe8441" into nyc-mr1-dev-plus-aosp
am:
e3f3aef1e1
* commit '
e3f3aef1e13931fd250e5e93cdc151155f474a43':
Change-Id: I4c6a6bd3dda19537b775551459cedbc4379020c8
Keith Cheung [Thu, 21 Apr 2016 15:44:50 +0000 (15:44 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878 am:
d932c41831
am:
58d16d50b2
* commit '
58d16d50b2b7bef505b32b22d4e22394903d7475':
Include work app in battery optimization settings
Change-Id: Ia9a5c9a1948f6d489213022644888ec310d17ac9
Android Build Merger (Role) [Thu, 21 Apr 2016 15:43:25 +0000 (15:43 +0000)]
Merge "Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878 am:
43effe8441" into nyc-mr1-dev-plus-aosp
Keith Cheung [Thu, 21 Apr 2016 15:43:18 +0000 (15:43 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878
am:
43effe8441
* commit '
43effe8441027d92f73616aade1926ecc1a50d28':
Change-Id: Iace769b2bcd6611a4293f8afc6f220b98b07eeb8
Android Build Merger (Role) [Thu, 21 Apr 2016 15:42:40 +0000 (15:42 +0000)]
Merge "Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878 am:
43effe8441" into nyc-mr1-dev-plus-aosp
Keith Cheung [Thu, 21 Apr 2016 15:42:31 +0000 (15:42 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878
am:
43effe8441
* commit '
43effe8441027d92f73616aade1926ecc1a50d28':
Include work app in battery optimization settings
Change-Id: I616d9993eab9f996aed1daff9256447acfc177c4
Keith Cheung [Thu, 21 Apr 2016 15:42:30 +0000 (15:42 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev am:
9b167a6878
am:
d932c41831
* commit '
d932c4183194c1d664a07a440f20c467a8d1189a':
Include work app in battery optimization settings
Change-Id: I2e8d185c2b650ca8d89d47ae9260aa758ba8c7fd
Keith Cheung [Thu, 21 Apr 2016 15:38:30 +0000 (15:38 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev
am:
9b167a6878
* commit '
9b167a6878d036ffb253687a4eb94e1e44e5fda4':
Include work app in battery optimization settings
Change-Id: I61f2d84f5f57234a2dbb7a5ef4059b5e63fdfdda
Keith Cheung [Thu, 21 Apr 2016 15:38:02 +0000 (15:38 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev
am:
9b167a6878
* commit '
9b167a6878d036ffb253687a4eb94e1e44e5fda4':
Include work app in battery optimization settings
Change-Id: I9998aecbbd7acea6222aa65c6928864b5ea4cd5f
Keith Cheung [Thu, 21 Apr 2016 15:18:06 +0000 (15:18 +0000)]
Merge "Include work app in battery optimization settings" into nyc-dev
Jason Monk [Thu, 21 Apr 2016 14:30:05 +0000 (14:30 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev am:
7bcc48f77d am:
ec2516dc0b
am:
9f1b88c30c
* commit '
9f1b88c30c78f19735371fff9a08a9748c30099d':
Change-Id: I9855f30efdaeea5a39853a01c9e2a1036839fa51
Jason Monk [Thu, 21 Apr 2016 14:30:04 +0000 (14:30 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev am:
7bcc48f77d am:
a2f7a5980e
am:
763f5c4411
* commit '
763f5c4411223f4a3b544141b2ac7843467d56b7':
Fix only one battery stat showing sometimes.
Change-Id: I68178af4d72ced2c914378f18b46a6dcdc36624e
Jason Monk [Thu, 21 Apr 2016 14:27:56 +0000 (14:27 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev am:
7bcc48f77d
am:
ec2516dc0b
* commit '
ec2516dc0b05e5d1bac0a7b0c6252623bdcb3def':
Change-Id: I5b02178f6524942d352cbb8af5722553cf4317f6
Jason Monk [Thu, 21 Apr 2016 14:27:44 +0000 (14:27 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev am:
7bcc48f77d
am:
a2f7a5980e
* commit '
a2f7a5980e08c446ddf5748e4074c1c1f4e8252c':
Fix only one battery stat showing sometimes.
Change-Id: I1613068ba88096d78a3894d19135e591f034a191
Jason Monk [Thu, 21 Apr 2016 14:26:01 +0000 (14:26 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev
am:
7bcc48f77d
* commit '
7bcc48f77d1110a14e0cf984431da435ad1b47a5':
Fix only one battery stat showing sometimes.
Change-Id: I70aac29590b8b65bd904a07f441f467cb7041930
Jason Monk [Thu, 21 Apr 2016 14:25:31 +0000 (14:25 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev
am:
7bcc48f77d
* commit '
7bcc48f77d1110a14e0cf984431da435ad1b47a5':
Fix only one battery stat showing sometimes.
Change-Id: Ie7abb1569eee61ce2eb28a73728a60695e481f6e
Jason Monk [Thu, 21 Apr 2016 14:21:40 +0000 (14:21 +0000)]
Merge "Fix only one battery stat showing sometimes." into nyc-dev
Jason Monk [Thu, 21 Apr 2016 14:12:30 +0000 (10:12 -0400)]
Fix only one battery stat showing sometimes.
Take into account the prefs we are currently caching within the
group when counting how many prefs have been added.
Change-Id: I962acd41592c1a9366882711d3f4944bffb54d22
Fixes:
27931457
Keisuke Kuroyanagi [Thu, 21 Apr 2016 14:03:22 +0000 (14:03 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am:
bf0e1338ec am:
9bbeeb708f
am:
f73450cd14
* commit '
f73450cd14bf51ac96c7a9ebffb64765cd1ffca0':
Change-Id: Ieb6e681feb880a86c8a00e23661b41a5a218e375
Keisuke Kuroyanagi [Thu, 21 Apr 2016 14:03:21 +0000 (14:03 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am:
bf0e1338ec am:
172829299a
am:
2aa8800f46
* commit '
2aa8800f46920ab531ba87d4873ecd992d0b96e1':
Fix: Spell checker cannot be re-enabled.
Change-Id: Ie34d510218acd8046414efb37dd747067e4b082f
Keisuke Kuroyanagi [Thu, 21 Apr 2016 14:01:25 +0000 (14:01 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am:
bf0e1338ec
am:
9bbeeb708f
* commit '
9bbeeb708ffd3216d851d5fce76e3b05e7a0e27b':
Change-Id: I5549fdcdc28338a9053a10e5ced279f76674b240
Keisuke Kuroyanagi [Thu, 21 Apr 2016 14:01:14 +0000 (14:01 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev am:
bf0e1338ec
am:
172829299a
* commit '
172829299a211ee5aac2c5f417c3848a7a9d04a8':
Fix: Spell checker cannot be re-enabled.
Change-Id: Ide8c8050138f0fa223815661cbec5f9545d7db66
Keisuke Kuroyanagi [Thu, 21 Apr 2016 13:59:32 +0000 (13:59 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
am:
bf0e1338ec
* commit '
bf0e1338ec8ba44b9f03d6c832003ebfa5593d70':
Fix: Spell checker cannot be re-enabled.
Change-Id: I69ff82d861702714af39c51bc199560c5d124112
Keisuke Kuroyanagi [Thu, 21 Apr 2016 13:59:03 +0000 (13:59 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
am:
bf0e1338ec
* commit '
bf0e1338ec8ba44b9f03d6c832003ebfa5593d70':
Fix: Spell checker cannot be re-enabled.
Change-Id: Idaa58d83e77dbcface0f44e8fd83105bae8653e3
Keith Cheung [Mon, 18 Apr 2016 17:36:49 +0000 (18:36 +0100)]
Include work app in battery optimization settings
Fix:
23684151
Change-Id: If2d1a18838414122d8af57fda7138f87fd3f1e62
Keisuke Kuroyanagi [Thu, 21 Apr 2016 13:38:14 +0000 (13:38 +0000)]
Merge "Fix: Spell checker cannot be re-enabled." into nyc-dev
Julia Reynolds [Thu, 21 Apr 2016 12:50:51 +0000 (12:50 +0000)]
Merge "Merge "Don\'t save a rule without a name." into nyc-dev am:
257355afde am:
8db5a1313f" into nyc-mr1-dev-plus-aosp
am:
e676f18650
* commit '
e676f18650adf64504fb56f4a1a8d2ce20caa52d':
Change-Id: I6f92a1c8be1779602e71083b62308aca8d8a4905
Julia Reynolds [Thu, 21 Apr 2016 12:50:50 +0000 (12:50 +0000)]
Merge "Don\'t save a rule without a name." into nyc-dev am:
257355afde am:
b6dfee89f7
am:
c776852e03
* commit '
c776852e03ed60f9bdde2a38e39b76010247f6b0':
Don't save a rule without a name.
Change-Id: I873acd02fdb3486865ca3bbe00c394447bf0d4e6
Android Build Merger (Role) [Thu, 21 Apr 2016 12:48:47 +0000 (12:48 +0000)]
Merge "Merge "Don\'t save a rule without a name." into nyc-dev am:
257355afde am:
8db5a1313f" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 21 Apr 2016 12:48:40 +0000 (12:48 +0000)]
Merge "Don\'t save a rule without a name." into nyc-dev am:
257355afde
am:
8db5a1313f
* commit '
8db5a1313feb404295713a1f19758bb8eaaea721':
Don't save a rule without a name.
Change-Id: I6014fc170e8b227fba9dca41a78a7a1c260029ec
Julia Reynolds [Thu, 21 Apr 2016 12:48:31 +0000 (12:48 +0000)]
Merge "Don\'t save a rule without a name." into nyc-dev am:
257355afde
am:
b6dfee89f7
* commit '
b6dfee89f71b436b827506272d27218e90d54cd6':
Don't save a rule without a name.
Change-Id: Ie6788c6b81480fdfdb228945bd4f2451bc99b78c
Julia Reynolds [Thu, 21 Apr 2016 12:46:43 +0000 (12:46 +0000)]
Merge "Don\'t save a rule without a name." into nyc-dev
am:
257355afde
* commit '
257355afde546a408e4f47b59fff97df9d09cf9d':
Don't save a rule without a name.
Change-Id: If2c2b8d4d97c14df6c68277fed639197535c8ba9
Julia Reynolds [Thu, 21 Apr 2016 12:46:17 +0000 (12:46 +0000)]
Merge "Don\'t save a rule without a name." into nyc-dev
am:
257355afde
* commit '
257355afde546a408e4f47b59fff97df9d09cf9d':
Don't save a rule without a name.
Change-Id: I1d05e1f66b8909a8153001b39aa98a625bc1ae75
Julia Reynolds [Thu, 21 Apr 2016 12:29:30 +0000 (12:29 +0000)]
Merge "Don't save a rule without a name." into nyc-dev
Brian Carlstrom [Thu, 21 Apr 2016 05:21:51 +0000 (22:21 -0700)]
Fix build by removing reference to createToastController
Bug:
27751878
Change-Id: Ia1453021b81481984b1830224baf5fe98b11dc15
Jim Miller [Thu, 21 Apr 2016 03:29:04 +0000 (03:29 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am:
25c0b7b am:
3e38542502
am:
9145064fbd
* commit '
9145064fbda66be1402afc35087e082f778e0d1b':
Change-Id: Ib2efb0534b30f9c918e8cffb401bb66452bb276a
Jim Miller [Thu, 21 Apr 2016 03:29:04 +0000 (03:29 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am:
25c0b7b am:
a2d94e9
am:
eb362d24a6
* commit '
eb362d24a667acc5fcd48491dca135d17dfb6a21':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I425f9473b8b361cb4734f575df1b66592ee70c17
Udam Saini [Thu, 21 Apr 2016 03:29:03 +0000 (03:29 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev am:
e0892e1 am:
f21a205
am:
48c375991b
* commit '
48c375991b8ee6d859b590a8ce7feb49b035dd19':
Change-Id: I6130990585f8639a9e4b5f10e29e1948bc99861e
Jason Monk [Thu, 21 Apr 2016 03:29:02 +0000 (03:29 +0000)]
Merge "Remove some of the unused assets" into nyc-dev am:
8b8002b am:
e29e622
am:
27e7979a82
* commit '
27e7979a82e6f329983211941912eba412fa9f41':
Change-Id: Ia2c0ef4262fdf7e9c828cdf3431f7abeb8621f6b
Jason Monk [Thu, 21 Apr 2016 03:29:01 +0000 (03:29 +0000)]
Merge "Add minimum date" into nyc-dev am:
17b554c am:
b5c9e22
am:
b372709b81
* commit '
b372709b81f676c773f586a8e71f543d68f2baa2':
Change-Id: I09ab6506661d980aa4cafc22dab5a27238a64d3b
Ruben Brunk [Thu, 21 Apr 2016 03:29:00 +0000 (03:29 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev am:
3a3d110 am:
a72edfb
am:
11279b12a8
* commit '
11279b12a81e201531f0953cebacd77f26ea7d88':
Change-Id: I18521be099ae45e1390bf2e559b5e8bd7633fcf3
Sudheer Shanka [Thu, 21 Apr 2016 03:28:58 +0000 (03:28 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am:
c2dae39 am:
122b781
am:
1f96302666
* commit '
1f963026669b22033ba8d10c7302d5501240881d':
Change-Id: Iad0f72b571274266da429d70e241c0813be17e00
Sudheer Shanka [Thu, 21 Apr 2016 03:28:57 +0000 (03:28 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am:
b2f161a am:
5a80da4
am:
12d5de9705
* commit '
12d5de97053ddc9e81f769e82f37286fd1d98cf3':
Change-Id: Ifa82d7990a5d19f204b0d319b3dcc76286365f04
Jason Monk [Thu, 21 Apr 2016 03:27:36 +0000 (03:27 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev am:
ea80ebc am:
a60e5b5
am:
08b7add260
* commit '
08b7add2607acbe41b9e5d8cde94f56bf77df140':
Change-Id: I53fd6968a3230a954910326501d883a8d1952cd7
Felipe Leme [Thu, 21 Apr 2016 03:27:29 +0000 (03:27 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am:
4f5568a am:
3c62091
am:
03757401b3
* commit '
03757401b3206a2cd8f36cb977cac765186dcce6':
Change-Id: Ia755054ae1a4e6075ac4554490d3e285e0a7fd74
Jason Monk [Thu, 21 Apr 2016 03:27:20 +0000 (03:27 +0000)]
Merge "Fix sim status screen" into nyc-dev am:
e9dffcd am:
5ea44d0
am:
e346e4f114
* commit '
e346e4f11488547272e7eaf1133014e85108bd20':
Change-Id: I3225959fd502fe393d50fde539cbf88a8a935bb4
Jason Monk [Thu, 21 Apr 2016 03:27:13 +0000 (03:27 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev am:
0bea8a9 am:
c58b6b7
am:
ea952e0aea
* commit '
ea952e0aea9f621ee1a6983db71c41e949ae2451':
Change-Id: Iba3b192e2b88d2a031d67a421a2e620851083cf4
Udam Saini [Thu, 21 Apr 2016 03:27:07 +0000 (03:27 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev am:
e0892e1 am:
be21812
am:
8e9323b840
* commit '
8e9323b840b47b31ce294584789929191a578a35':
Fixes a string for tablets/devices
Change-Id: Ifc93fc2f12ac5e0e937d7bf23196db292a767e9c
Fan Zhang [Thu, 21 Apr 2016 03:27:03 +0000 (03:27 +0000)]
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev am:
01f1779
am:
9fc57d0eba -s ours
* commit '
9fc57d0eba592d41db665178a8e4830c5ac7f378':
Display setting and support in a tab layout - DO NOT MERGE
Change-Id: I0a40dd2e146d11faa6188685f3d4026e31e71ba5
Jason Monk [Thu, 21 Apr 2016 03:27:00 +0000 (03:27 +0000)]
Merge "Remove some of the unused assets" into nyc-dev am:
8b8002b am:
1a49ebc
am:
1c7415767b
* commit '
1c7415767b37ea335b53639410e86ecc1386b964':
Remove some of the unused assets
Change-Id: If2c3fbd8b4cb8a8514e4ca9df57f1d1dd07a45d9
Jason Monk [Thu, 21 Apr 2016 03:26:57 +0000 (03:26 +0000)]
Merge "Add minimum date" into nyc-dev am:
17b554c am:
a0a1055
am:
efb6eb8613
* commit '
efb6eb861389a4c6fbb70c98a74d9681003589ee':
Add minimum date
Change-Id: Ia608435b123c9d1c1f6cc6e8a5ab2b44dcaa4e0e
Ruben Brunk [Thu, 21 Apr 2016 03:26:55 +0000 (03:26 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev am:
3a3d110 am:
0db43e4
am:
df317dba47
* commit '
df317dba4759d97cf78c78b023449090d36e4552':
Add settings for altering VR display behavior.
Change-Id: Ib364edb27c678f2bb232fda3b7216b1ca0ac8874
Sudheer Shanka [Thu, 21 Apr 2016 03:26:52 +0000 (03:26 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am:
c2dae39 am:
14aa458
am:
a711612c35
* commit '
a711612c35825db850cb42604847b3137c05eb72':
Fix summaries of some restricted switch preferences.
Change-Id: I40dfb91e4d8df6af7b4042d1ad3ecfe943790f3f
Sudheer Shanka [Thu, 21 Apr 2016 03:26:48 +0000 (03:26 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am:
b2f161a am:
c80d630
am:
391878a328
* commit '
391878a3280d039865db4eb2ed29923601e146c7':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: I97857b9c7fa8c2c931eda82cea82bd3121716279
Jason Monk [Thu, 21 Apr 2016 03:26:43 +0000 (03:26 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev am:
ea80ebc am:
040acf7
am:
36a3081447
* commit '
36a30814476c1a182c0501af7a7f3721a3b8cfde':
Daydream -> Screen saver
Change-Id: I6823cabfd270bed0698a926ceec6e2816b00b631
Felipe Leme [Thu, 21 Apr 2016 03:26:39 +0000 (03:26 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am:
4f5568a am:
4d1954f
am:
d0ff9d63fa
* commit '
d0ff9d63fa0a4dda099db24bb5923915f9765025':
Listen to INetworkPolicyManager events and update UI accordingly.
Change-Id: Ia8f93a21180642a7466190e7fae821d25659d182
Jason Monk [Thu, 21 Apr 2016 03:26:35 +0000 (03:26 +0000)]
Merge "Fix sim status screen" into nyc-dev am:
e9dffcd am:
18bf2fb
am:
bdbf6e771a
* commit '
bdbf6e771a773a228787adaf1264655538b937b5':
Fix sim status screen
Change-Id: Ia0a1eb92232845492be5fc25e89e7257aeaab4aa
Jason Monk [Thu, 21 Apr 2016 03:26:30 +0000 (03:26 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev am:
0bea8a9 am:
018d99c
am:
6d2afc0cc3
* commit '
6d2afc0cc3f7e6cf5936cef69a5eb88e2503d2bf':
Fix storage title clearing in multi-window
Change-Id: I27502e83f1fc2d5adf5a165bf398d7b35031773f
Andrew Sapperstein [Thu, 21 Apr 2016 03:25:56 +0000 (03:25 +0000)]
Remove ToastController. am:
1d1a269
am:
3c05137c23 -s ours
* commit '
3c05137c23bd2ebb61c7e9cd933b7d89d70f8905':
Remove ToastController.
Change-Id: Ib835fb1f802ac67e40850c14b929d0846be2cf99
Andrew Sapperstein [Thu, 21 Apr 2016 00:56:12 +0000 (17:56 -0700)]
resolve merge conflicts of
b0c58aa to master
Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
Jim Miller [Thu, 21 Apr 2016 00:20:42 +0000 (00:20 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am:
25c0b7b
am:
3e38542502
* commit '
3e38542502745d5d987e6567554bdcbcdc76a4ac':
Change-Id: Iefb67eb541ba4ae9afe9a55dab0891bce254d27d
Jim Miller [Wed, 20 Apr 2016 22:20:38 +0000 (22:20 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am:
25c0b7b
am:
a2d94e9
* commit '
a2d94e9973a0e3072859d924c55c04225eaa9186':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I4b9f0eb86fafdfc430c1939d51f2d584216d3409
Udam Saini [Wed, 20 Apr 2016 22:20:37 +0000 (22:20 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev am:
e0892e1
am:
f21a205
* commit '
f21a205ff3bfcae0436b3ff05bee74d51423daa9':
Change-Id: Ib1f071930776981c3618d195ef869665d85fc710
TreeHugger Robot [Wed, 20 Apr 2016 22:20:37 +0000 (22:20 +0000)]
Merge "Remove some of the unused assets" into nyc-dev am:
8b8002b
am:
e29e622
* commit '
e29e622b4e8911ed87c38e7b228eadaf9e8a947c':
Change-Id: Idb1126a34f1049e4b1cd9ee46e2641554d5b38c1
Jason Monk [Wed, 20 Apr 2016 22:20:36 +0000 (22:20 +0000)]
Merge "Add minimum date" into nyc-dev am:
17b554c
am:
b5c9e22
* commit '
b5c9e227771e58aab2980f738deffbcfcc4c1177':
Change-Id: I9fb218bef76d517be57c4c608e26cbc9ce55b29d
Ruben Brunk [Wed, 20 Apr 2016 22:20:35 +0000 (22:20 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev am:
3a3d110
am:
a72edfb
* commit '
a72edfb23d8efb0d3b1dd81f9826f9477837069d':
Change-Id: I916985ffd27a6e9b7a9a6057bb9bbc91648b60a2
Sudheer Shanka [Wed, 20 Apr 2016 22:20:34 +0000 (22:20 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am:
c2dae39
am:
122b781
* commit '
122b781d3a7be39a53855d60f0cc0500d5ebbb1c':
Change-Id: I2e8b1ba4abb19e70e72d73304894c8ee48a78475
Sudheer Shanka [Wed, 20 Apr 2016 22:20:33 +0000 (22:20 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am:
b2f161a
am:
5a80da4
* commit '
5a80da4bd102a2f5f7f04539d8c622be2479af26':
Change-Id: I2766a5a5b526ea3c19369daf0f2751f4e543c7e6
Jason Monk [Wed, 20 Apr 2016 22:20:32 +0000 (22:20 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev am:
ea80ebc
am:
a60e5b5
* commit '
a60e5b52d8c0b800f6be86614dff3735013fd417':
Change-Id: Iba03018da665fc0eccab9ba13d6b5f4ba724719b
TreeHugger Robot [Wed, 20 Apr 2016 22:20:31 +0000 (22:20 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am:
4f5568a
am:
3c62091
* commit '
3c620915118e06b2b1e5c418429584ceaa10152f':
Change-Id: I06a5fd0cbe88d8a36fd7c13e67c23547cbd21319
Jason Monk [Wed, 20 Apr 2016 22:20:29 +0000 (22:20 +0000)]
Merge "Fix sim status screen" into nyc-dev am:
e9dffcd
am:
5ea44d0
* commit '
5ea44d0adde3876a69aecb1a87e4007b6bce143f':
Change-Id: I33ae907e60080094307acbbdfa99a9e36c048523
Jason Monk [Wed, 20 Apr 2016 22:20:27 +0000 (22:20 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev am:
0bea8a9
am:
c58b6b7
* commit '
c58b6b7e1aca62e230cbf1e8e292d396b9857e08':
Change-Id: I3514b8edcf3a9a03095e726c04c70ba65f544848
Jim Miller [Wed, 20 Apr 2016 21:46:04 +0000 (21:46 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am:
25c0b7b
* commit '
25c0b7bc4e12d6f0774695ca504118abba81ea88':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I62d0d25643df925e45e895ad40e2f3ad289a8812
Udam Saini [Wed, 20 Apr 2016 21:44:15 +0000 (21:44 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev am:
e0892e1
am:
be21812
* commit '
be218128276f3537d8afc1d4cced76adeb20a3d7':
Fixes a string for tablets/devices
Change-Id: I44a894f21aa0e490b93ff700129545cf13a999bc
Fan Zhang [Wed, 20 Apr 2016 21:44:14 +0000 (21:44 +0000)]
Merge "Display setting and support in a tab layout - DO NOT MERGE" into nyc-mr1-dev
am:
01f1779
* commit '
01f177982d1c38a9b85ddb2c22661a12081256a2':
Display setting and support in a tab layout - DO NOT MERGE
Change-Id: I43cd0b99d98bc7bda0aa751a56a7ac8ec03f28dc
TreeHugger Robot [Wed, 20 Apr 2016 21:44:14 +0000 (21:44 +0000)]
Merge "Remove some of the unused assets" into nyc-dev am:
8b8002b
am:
1a49ebc
* commit '
1a49ebc1af4abee5e08d7c798c966abd931c1677':
Remove some of the unused assets
Change-Id: Id8a0a645fabd3746e45bdcab43024141813dda92
Jason Monk [Wed, 20 Apr 2016 21:44:14 +0000 (21:44 +0000)]
Merge "Add minimum date" into nyc-dev am:
17b554c
am:
a0a1055
* commit '
a0a1055316a9d721c4439813b15af0b4c92d0e6e':
Add minimum date
Change-Id: I82ebfc3618156b163581ef20cf960c510fadcb16
Ruben Brunk [Wed, 20 Apr 2016 21:44:13 +0000 (21:44 +0000)]
Merge "Add settings for altering VR display behavior." into nyc-dev am:
3a3d110
am:
0db43e4
* commit '
0db43e44d04854aec6c3d8902fe7a78b9047816c':
Add settings for altering VR display behavior.
Change-Id: I8c79191c9baf60258543ea5718a647012c720c51
Sudheer Shanka [Wed, 20 Apr 2016 21:44:12 +0000 (21:44 +0000)]
Merge "Fix summaries of some restricted switch preferences." into nyc-dev am:
c2dae39
am:
14aa458
* commit '
14aa458510294c67d2fabecb8058e76ad15ceefa':
Fix summaries of some restricted switch preferences.
Change-Id: Idec83fbfa710c27d961d406f366285a47c8cf5a0
Sudheer Shanka [Wed, 20 Apr 2016 21:44:10 +0000 (21:44 +0000)]
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev am:
b2f161a
am:
c80d630
* commit '
c80d6305592052c91a86d68aede04cbd226c4d9e':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: Id96188a427f4ff0d306e4f77e8ee600624cee8fa
Jason Monk [Wed, 20 Apr 2016 21:44:08 +0000 (21:44 +0000)]
Merge "Daydream -> Screen saver" into nyc-dev am:
ea80ebc
am:
040acf7
* commit '
040acf7dabbcc9a5673755e86e765298d381ff1d':
Daydream -> Screen saver
Change-Id: I5ab92bba5acb4d71118047f3fa5c04593cd8136a
TreeHugger Robot [Wed, 20 Apr 2016 21:44:06 +0000 (21:44 +0000)]
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev am:
4f5568a
am:
4d1954f
* commit '
4d1954f71faf34f7995702cdd9fb3a5e1342841c':
Listen to INetworkPolicyManager events and update UI accordingly.
Change-Id: I5c7b5c9d937af9da035fbef54eab75b70ef16b8a
Jason Monk [Wed, 20 Apr 2016 21:44:05 +0000 (21:44 +0000)]
Merge "Fix sim status screen" into nyc-dev am:
e9dffcd
am:
18bf2fb
* commit '
18bf2fbdac097ab078cd3c2b726cc9fc971c9dd9':
Fix sim status screen
Change-Id: I9b33ff21135b1d39938a6cbf34e013045629b429
Jason Monk [Wed, 20 Apr 2016 21:44:02 +0000 (21:44 +0000)]
Merge "Fix storage title clearing in multi-window" into nyc-dev am:
0bea8a9
am:
018d99c
* commit '
018d99cd288622bc4daf37b969e3340441bcb28d':
Fix storage title clearing in multi-window
Change-Id: I0e1f19ca14989df82c65adbb0612dcc97370f27b
Andrew Sapperstein [Wed, 20 Apr 2016 21:44:01 +0000 (21:44 +0000)]
Remove ToastController.
am:
1d1a269
* commit '
1d1a2694e93f5b9d8c6fe01a3be8737ae0034736':
Remove ToastController.
Change-Id: I933a0091c6a16115ea112eb13f2c19592d2c0d6c
Andrew Sapperstein [Wed, 20 Apr 2016 21:43:58 +0000 (21:43 +0000)]
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
am:
12344c5
* commit '
12344c5ff5be19e9f610df033b2cdf529cd13d76':
Create feature factory interface & initial impl.
Change-Id: I0e4cb8ae5c4ac749b38da306d870be01c1775958
Jim Miller [Wed, 20 Apr 2016 21:42:23 +0000 (21:42 +0000)]
Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am:
25c0b7b
* commit '
25c0b7bc4e12d6f0774695ca504118abba81ea88':
Fix bug where fingerprint for wrong userId was attempted to be removed.
Change-Id: I1c7df2c60f898807a3e64fa714db4ff4675835fc
Udam Saini [Wed, 20 Apr 2016 21:42:22 +0000 (21:42 +0000)]
Merge "Fixes a string for tablets/devices" into nyc-dev
am:
e0892e1
* commit '
e0892e16adb55e3f0b368b9d461efae09bf38c5b':
Fixes a string for tablets/devices
Change-Id: I63f0475602c2ca19053387ca7c08e6881828a22e
Jason Monk [Wed, 20 Apr 2016 21:42:22 +0000 (21:42 +0000)]
Merge "Remove some of the unused assets" into nyc-dev
am:
8b8002b
* commit '
8b8002b50831e8c93df0f04e2e6605719585b985':
Remove some of the unused assets
Change-Id: Ibcbcd933131aa12feb5b226c76a943d947c77db0
OSDN Git Service
