Jason Monk
|
7b3f43150b
|
Merge "Add minimum date" into nyc-dev am: 17b554c am: a0a1055
am: efb6eb8613
* commit 'efb6eb861389a4c6fbb70c98a74d9681003589ee':
Add minimum date
Change-Id: Ia608435b123c9d1c1f6cc6e8a5ab2b44dcaa4e0e
|
2016-04-21 03:26:57 +00:00 |
|
Ruben Brunk
|
af29fad670
|
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
|
2016-04-21 03:26:55 +00:00 |
|
Sudheer Shanka
|
1bc6452083
|
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
|
2016-04-21 03:26:52 +00:00 |
|
Sudheer Shanka
|
8e22c9366b
|
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
|
2016-04-21 03:26:48 +00:00 |
|
Jason Monk
|
97f31d2942
|
Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc am: 040acf7
am: 36a3081447
* commit '36a30814476c1a182c0501af7a7f3721a3b8cfde':
Daydream -> Screen saver
Change-Id: I6823cabfd270bed0698a926ceec6e2816b00b631
|
2016-04-21 03:26:43 +00:00 |
|
Felipe Leme
|
f4e4aebb18
|
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
|
2016-04-21 03:26:39 +00:00 |
|
Jason Monk
|
72b9fbf0a1
|
Merge "Fix sim status screen" into nyc-dev am: e9dffcd am: 18bf2fb
am: bdbf6e771a
* commit 'bdbf6e771a773a228787adaf1264655538b937b5':
Fix sim status screen
Change-Id: Ia0a1eb92232845492be5fc25e89e7257aeaab4aa
|
2016-04-21 03:26:35 +00:00 |
|
Jason Monk
|
9b8d070f42
|
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
|
2016-04-21 03:26:30 +00:00 |
|
Andrew Sapperstein
|
ffced3af7f
|
Remove ToastController. am: 1d1a269
am: 3c05137c23 -s ours
* commit '3c05137c23bd2ebb61c7e9cd933b7d89d70f8905':
Remove ToastController.
Change-Id: Ib835fb1f802ac67e40850c14b929d0846be2cf99
|
2016-04-21 03:25:56 +00:00 |
|
Andrew Sapperstein
|
2524686c66
|
resolve merge conflicts of b0c58aa to master
Change-Id: Icc3af5956eb53de76c0384dccd662c6019c0958b
|
2016-04-20 17:56:12 -07:00 |
|
Jason Monk
|
efb6eb8613
|
Merge "Add minimum date" into nyc-dev am: 17b554c
am: a0a1055
* commit 'a0a1055316a9d721c4439813b15af0b4c92d0e6e':
Add minimum date
Change-Id: I82ebfc3618156b163581ef20cf960c510fadcb16
|
2016-04-20 21:44:14 +00:00 |
|
Ruben Brunk
|
df317dba47
|
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
|
2016-04-20 21:44:13 +00:00 |
|
Sudheer Shanka
|
a711612c35
|
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
|
2016-04-20 21:44:12 +00:00 |
|
Sudheer Shanka
|
391878a328
|
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
|
2016-04-20 21:44:10 +00:00 |
|
Jason Monk
|
36a3081447
|
Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc
am: 040acf7
* commit '040acf7dabbcc9a5673755e86e765298d381ff1d':
Daydream -> Screen saver
Change-Id: I5ab92bba5acb4d71118047f3fa5c04593cd8136a
|
2016-04-20 21:44:08 +00:00 |
|
TreeHugger Robot
|
d0ff9d63fa
|
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
|
2016-04-20 21:44:06 +00:00 |
|
Jason Monk
|
bdbf6e771a
|
Merge "Fix sim status screen" into nyc-dev am: e9dffcd
am: 18bf2fb
* commit '18bf2fbdac097ab078cd3c2b726cc9fc971c9dd9':
Fix sim status screen
Change-Id: I9b33ff21135b1d39938a6cbf34e013045629b429
|
2016-04-20 21:44:05 +00:00 |
|
Jason Monk
|
6d2afc0cc3
|
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
|
2016-04-20 21:44:02 +00:00 |
|
Andrew Sapperstein
|
3c05137c23
|
Remove ToastController.
am: 1d1a269
* commit '1d1a2694e93f5b9d8c6fe01a3be8737ae0034736':
Remove ToastController.
Change-Id: I933a0091c6a16115ea112eb13f2c19592d2c0d6c
|
2016-04-20 21:44:01 +00:00 |
|
Andrew Sapperstein
|
b0c58aa530
|
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
am: 12344c5
* commit '12344c5ff5be19e9f610df033b2cdf529cd13d76':
Create feature factory interface & initial impl.
Change-Id: I0e4cb8ae5c4ac749b38da306d870be01c1775958
|
2016-04-20 21:43:58 +00:00 |
|
Jason Monk
|
a0a1055316
|
Merge "Add minimum date" into nyc-dev
am: 17b554c
* commit '17b554c8b7b05b6c31b1aba15ea2067c50d08153':
Add minimum date
Change-Id: I12809498e61faa81775d7ba97d358db779c0a14b
|
2016-04-20 20:48:42 +00:00 |
|
Jason Monk
|
17b554c8b7
|
Merge "Add minimum date" into nyc-dev
|
2016-04-20 20:36:36 +00:00 |
|
Ruben Brunk
|
0db43e44d0
|
Merge "Add settings for altering VR display behavior." into nyc-dev
am: 3a3d110
* commit '3a3d110a504bb0c1ea91ec6e98fcd158cbd8532e':
Add settings for altering VR display behavior.
Change-Id: I051c2374bfc6ecaafff178e06079434958f53136
|
2016-04-20 20:04:03 +00:00 |
|
Ruben Brunk
|
3a3d110a50
|
Merge "Add settings for altering VR display behavior." into nyc-dev
|
2016-04-20 19:51:50 +00:00 |
|
Ruben Brunk
|
e4d95c087b
|
Add settings for altering VR display behavior.
Bug=28208992
Change-Id: I73e3154e7766f7379af558c66316c213fdd494d8
|
2016-04-20 12:49:05 -07:00 |
|
Jason Monk
|
78f7b416c0
|
Add minimum date
Change-Id: I928c99b7b2eb3dc35b2e25034dfe32a784355239
Fixes: 26346842
|
2016-04-20 15:44:21 -04:00 |
|
Sudheer Shanka
|
14aa458510
|
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
am: c2dae39
* commit 'c2dae39ab4ab2531c9a8afff39fd99425e2a6bdd':
Fix summaries of some restricted switch preferences.
Change-Id: Ie84937b155d8c5382bbb697c3f70fccaf28b897e
|
2016-04-20 18:16:26 +00:00 |
|
Sudheer Shanka
|
c2dae39ab4
|
Merge "Fix summaries of some restricted switch preferences." into nyc-dev
|
2016-04-20 18:04:12 +00:00 |
|
Sudheer Shanka
|
c80d630559
|
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
am: b2f161a
* commit 'b2f161ab389469c7029efe4915aef06e9671ffdb':
Apply policy transparency to "Stay awake" in Development settings.
Change-Id: I22816dad3b6a96d36062f395847eec36db205363
|
2016-04-20 18:02:35 +00:00 |
|
Jason Monk
|
040acf7dab
|
Merge "Daydream -> Screen saver" into nyc-dev
am: ea80ebc
* commit 'ea80ebcd92c94d99f22279101ee2bdc27499b55b':
Daydream -> Screen saver
Change-Id: I2536df1ef2c588a70f3820b15efda3b2fa366cae
|
2016-04-20 17:56:04 +00:00 |
|
Felipe Leme
|
4d1954f71f
|
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
am: 4f5568a
* commit '4f5568a8a0cd69968ae0a5278bb06ea8adc9414f':
Listen to INetworkPolicyManager events and update UI accordingly.
Change-Id: Iba51d696311d4ddafb34b0e21341ad63239ab89d
|
2016-04-20 17:56:04 +00:00 |
|
Sudheer Shanka
|
b2f161ab38
|
Merge "Apply policy transparency to "Stay awake" in Development settings." into nyc-dev
|
2016-04-20 17:50:32 +00:00 |
|
Jason Monk
|
ea80ebcd92
|
Merge "Daydream -> Screen saver" into nyc-dev
|
2016-04-20 17:49:02 +00:00 |
|
TreeHugger Robot
|
4f5568a8a0
|
Merge "Listen to INetworkPolicyManager events and update UI accordingly." into nyc-dev
|
2016-04-20 17:44:55 +00:00 |
|
Jason Monk
|
1ecc1f69b8
|
Daydream -> Screen saver
Change-Id: I7e283456f66750d61c920d92b53b107423b96e30
Fixes: 28268243
|
2016-04-20 13:39:18 -04:00 |
|
Jason Monk
|
18bf2fbdac
|
Merge "Fix sim status screen" into nyc-dev
am: e9dffcd
* commit 'e9dffcd34df3b1919f3843e0c0013fb793699e3f':
Fix sim status screen
Change-Id: Iba80d84350dbff891e3069b04e5f585b10f50491
|
2016-04-20 17:32:39 +00:00 |
|
Jason Monk
|
e9dffcd34d
|
Merge "Fix sim status screen" into nyc-dev
|
2016-04-20 17:24:24 +00:00 |
|
Jason Monk
|
13d1c384e8
|
Fix sim status screen
Change-Id: Id7a98b642b006beb8dc6999176184b5d90f6b22f
Fixes: 27963774
|
2016-04-20 13:22:36 -04:00 |
|
Jason Monk
|
018d99cd28
|
Merge "Fix storage title clearing in multi-window" into nyc-dev
am: 0bea8a9
* commit '0bea8a9f48eabefbd41484ffa19ec21637150a2c':
Fix storage title clearing in multi-window
Change-Id: Ic0063a2c0c4b705001ec9de42dc9054794e0d6f4
|
2016-04-20 17:19:11 +00:00 |
|
Jason Monk
|
0bea8a9f48
|
Merge "Fix storage title clearing in multi-window" into nyc-dev
|
2016-04-20 17:08:29 +00:00 |
|
Jason Monk
|
f3446f98d5
|
Fix storage title clearing in multi-window
By accurately tracking detached state.
Change-Id: If9d60000f7737c834afde680d15a2af21f7e3165
Fixes: 27989238
|
2016-04-20 13:05:45 -04:00 |
|
Andrew Sapperstein
|
1d1a2694e9
|
Remove ToastController.
Wasn't meant to be submitted.
Change-Id: Icc94daaf47ed85cefb59f20928241ef38d5ee2ca
(cherry picked from commit 17047d1939)
|
2016-04-20 16:54:13 +00:00 |
|
Andrew Sapperstein
|
12344c5ff5
|
Merge "Create feature factory interface & initial impl." into nyc-mr1-dev
|
2016-04-20 16:53:02 +00:00 |
|
Felipe Leme
|
85c63f348f
|
Listen to INetworkPolicyManager events and update UI accordingly.
BUG: 27481520
Change-Id: I09c4c586188d754ddd3ac3dcb3903217842ea0a5
|
2016-04-20 09:17:14 -07:00 |
|
Jason Monk
|
1e3cc4a35d
|
Merge "Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 3f53bdb" into nyc-mr1-dev-plus-aosp
am: b876efe
* commit 'b876efea975ffbedde0d75dc5444c047a6ce4c25':
Change-Id: Ia8b64753192505f1062a3246a6c3c880b1a77e39
|
2016-04-20 14:08:21 +00:00 |
|
Jason Monk
|
9cc4a117ef
|
Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 523f522
am: 9bb25af
* commit '9bb25af64652c40de3a96b993810f61f6b5b6697':
Potential fix for receiver leak problem
Change-Id: I1f0ef0c093637e9b954e52138198e558223a83d5
|
2016-04-20 14:08:20 +00:00 |
|
Android Build Merger (Role)
|
b876efea97
|
Merge "Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289 am: 3f53bdb" into nyc-mr1-dev-plus-aosp
|
2016-04-20 14:02:25 +00:00 |
|
Jason Monk
|
9bb25af646
|
Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289
am: 523f522
* commit '523f5228d44cb0a5670fe085bb13ed4217e4e027':
Potential fix for receiver leak problem
Change-Id: If393c4b4d814aab5f1eb4e0b08c2e5ac1b88bba1
|
2016-04-20 14:02:16 +00:00 |
|
Jason Monk
|
304235ea7d
|
Merge "Potential fix for receiver leak problem" into nyc-dev am: 623a289
am: 3f53bdb
* commit '3f53bdb8a32f6da6c77ce4ceae7c4b19cf095ef2':
Potential fix for receiver leak problem
Change-Id: I462601739977f6c3d50d0460df4bb82daeeae865
|
2016-04-20 14:02:15 +00:00 |
|
Jason Monk
|
3f53bdb8a3
|
Merge "Potential fix for receiver leak problem" into nyc-dev
am: 623a289
* commit '623a289b9a6563afd4c54e1efdb505a5468731ea':
Potential fix for receiver leak problem
Change-Id: I7cffbfd8a425af397dab9fa4900aab613520c4b5
|
2016-04-20 13:59:42 +00:00 |
|