Sundeep Ghuman
|
2fd9ad068a
|
Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b am: f5b7da9b32" into oc-mr1-dev-plus-aosp
am: c8d5463923
Change-Id: Ia3e0d750ab8f7541700b2a99b3b10bea2b826565
|
2017-07-25 23:47:18 +00:00 |
|
Lucas Dupin
|
04a3a0ec63
|
Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am: a1f64b0a91 am: 667c29d0be -s ours" into oc-mr1-dev-plus-aosp
am: 0c52de531a
Change-Id: I6b51fbbb233a523e3e710bfaadf9e36682063962
|
2017-07-25 23:43:49 +00:00 |
|
Jason Monk
|
ca1f32288a
|
Merge "Fix RTL for Nav icons" into oc-dr1-dev am: bad473d147 am: dbdc79aeba
am: 264e25870d
Change-Id: I56ca86d343b08a0cba4b4bb84751c8fc3a8967ec
|
2017-07-25 23:40:30 +00:00 |
|
Makoto Onuki
|
53a8bdbd13
|
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev am: 906d8f57bf am: 5d26d8ab06
am: 380354dcd5
Change-Id: Ifecb3f446533ba44917d9a1361ad16a1a4447268
|
2017-07-25 23:35:21 +00:00 |
|
Android Build Merger (Role)
|
c8d5463923
|
Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b am: f5b7da9b32" into oc-mr1-dev-plus-aosp
|
2017-07-25 23:32:18 +00:00 |
|
Android Build Merger (Role)
|
0c52de531a
|
Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am: a1f64b0a91 am: 667c29d0be -s ours" into oc-mr1-dev-plus-aosp
|
2017-07-25 23:31:49 +00:00 |
|
Sundeep Ghuman
|
295d4092de
|
Merge "Do not evict scan results in cold start." into oc-dr1-dev am: d68b6dc56b
am: f5b7da9b32
Change-Id: Ia43904db88f27c5b6a2d9c79fa049f5811303dde
|
2017-07-25 23:28:52 +00:00 |
|
Lucas Dupin
|
a6e2243b81
|
Merge "Fix jank when switching themes" into oc-dr1-dev am: a1f64b0a91
am: 667c29d0be -s ours
Change-Id: I317a622872898119bdae31b1cdcdeaa126be207a
|
2017-07-25 23:28:07 +00:00 |
|
Bill Yi
|
ea95cfc190
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: edfb7279ee -s ours am: 95ddead8e2 -s ours
am: c56c83a8f9 -s ours
Change-Id: Ic4f7b0af0c202b1f32435b96d3e3f7445a4a94b5
|
2017-07-25 23:26:17 +00:00 |
|
Jason Monk
|
264e25870d
|
Merge "Fix RTL for Nav icons" into oc-dr1-dev am: bad473d147
am: dbdc79aeba
Change-Id: I3cf273a39ea69c27181e4f7457d46d5fb3a916f4
|
2017-07-25 23:23:44 +00:00 |
|
Bill Yi
|
ebd5fb9c8b
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: f969869726 -s ours am: b79a16029a -s ours
am: 771a7200c3 -s ours
Change-Id: If6a7a149e336a3ae35878333f1fc63d8133cdd87
|
2017-07-25 23:18:17 +00:00 |
|
Makoto Onuki
|
380354dcd5
|
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev am: 906d8f57bf
am: 5d26d8ab06
Change-Id: I9983f42efb88fcb4e837ced6e243e32f05b3ef16
|
2017-07-25 23:17:20 +00:00 |
|
Winson Chung
|
cd3c3f1f57
|
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev am: cb9f6de368 am: 9509a0f3ea
am: 74478c529e
Change-Id: Ieeea1a2f8953f9866fa988495e8a214f1bf13adf
|
2017-07-25 23:12:12 +00:00 |
|
Alison Cichowlas
|
582529c8d1
|
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev am: 5110b31dda am: 41003287df
am: e8e173621f
Change-Id: Ibe948c63669c6da0ff4044152beaacaca8ac4a47
|
2017-07-25 23:09:45 +00:00 |
|
Sundeep Ghuman
|
f5b7da9b32
|
Merge "Do not evict scan results in cold start." into oc-dr1-dev
am: d68b6dc56b
Change-Id: If442689c6a05ad261a846a5252d9a0256520508e
|
2017-07-25 23:05:11 +00:00 |
|
Bill Yi
|
c56c83a8f9
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: edfb7279ee -s ours
am: 95ddead8e2 -s ours
Change-Id: I80081f49a026fd9b62a7db979742e7238b8143cf
|
2017-07-25 23:03:22 +00:00 |
|
Jason Monk
|
dbdc79aeba
|
Merge "Fix RTL for Nav icons" into oc-dr1-dev
am: bad473d147
Change-Id: I211be901cd264c3ff4f505abf54dd1d9d8c7667d
|
2017-07-25 23:02:11 +00:00 |
|
Andrew Sapperstein
|
57b2f0116e
|
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev am: b63b011419 am: 404f96719d
am: c756ca2577
Change-Id: I343d200b87ed8dfc4bd8cc04b5a33a5f0d42ea06
|
2017-07-25 23:01:19 +00:00 |
|
Bill Yi
|
771a7200c3
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: f969869726 -s ours
am: b79a16029a -s ours
Change-Id: Ie256f78c10fd7ffc65a2a47f0f2e0a23ba97238a
|
2017-07-25 22:59:26 +00:00 |
|
Makoto Onuki
|
5d26d8ab06
|
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
am: 906d8f57bf
Change-Id: Ied5b515396764d398807c4f945aaf55af87de03a
|
2017-07-25 22:58:23 +00:00 |
|
Winson Chung
|
74478c529e
|
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev am: cb9f6de368
am: 9509a0f3ea
Change-Id: I9354e48ddd1f8b3b979f7bb83e5bf785ecddff86
|
2017-07-25 22:56:24 +00:00 |
|
Lucas Dupin
|
831ddeffc9
|
Merge "Ambient indicator text color" into oc-dr1-dev am: 5c6c7586cd -s ours am: af12e50e00 -s ours
am: 000aedd5f4 -s ours
Change-Id: Ic2ac7b8eab5bdf71377fac70dce7788426851212
|
2017-07-25 22:54:19 +00:00 |
|
Alison Cichowlas
|
e8e173621f
|
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev am: 5110b31dda
am: 41003287df
Change-Id: Icb122e8ec2a84e8caf2f3438805d232b019cac90
|
2017-07-25 22:54:13 +00:00 |
|
Andrew Sapperstein
|
c756ca2577
|
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev am: b63b011419
am: 404f96719d
Change-Id: Ie931304d2e8eb77da1c1a9707b044c72daf3abbd
|
2017-07-25 22:44:31 +00:00 |
|
Bill Yi
|
95ddead8e2
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: edfb7279ee -s ours
Change-Id: I1464cf2e842dc2c9751a6e801a714cd9234fc563
|
2017-07-25 22:44:17 +00:00 |
|
TreeHugger Robot
|
963c1e2628
|
Merge "Settings: Remove SamplingProfiler vestiges"
|
2017-07-25 22:43:18 +00:00 |
|
Bill Yi
|
b79a16029a
|
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: f969869726 -s ours
Change-Id: I11b516cc23ae3714a6c75d937bdb6a24a772c255
|
2017-07-25 22:42:01 +00:00 |
|
TreeHugger Robot
|
d68b6dc56b
|
Merge "Do not evict scan results in cold start." into oc-dr1-dev
|
2017-07-25 22:41:39 +00:00 |
|
Lucas Dupin
|
f9d0d007ab
|
Merge "resolve merge conflicts of a1f64b0a9188 to oc-mr1-dev" into oc-mr1-dev am: fb4da9ea55
am: 58f6bf9f59
Change-Id: Ie1e285fbd00b550cba0e979dd245aa0f06ff0dcf
|
2017-07-25 22:40:42 +00:00 |
|
Winson Chung
|
9509a0f3ea
|
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
am: cb9f6de368
Change-Id: I37a8cf4df2a430ea1ecd2231d48bbfaa45a45d3d
|
2017-07-25 22:39:12 +00:00 |
|
Lucas Dupin
|
000aedd5f4
|
Merge "Ambient indicator text color" into oc-dr1-dev am: 5c6c7586cd -s ours
am: af12e50e00 -s ours
Change-Id: Id4e9ef06d91b3fde5f727efce8249d6f5a794f94
|
2017-07-25 22:38:36 +00:00 |
|
Alison Cichowlas
|
41003287df
|
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
am: 5110b31dda
Change-Id: I9a09aae1a3fe9957f8568af85c4f5ed1773b50f8
|
2017-07-25 22:36:50 +00:00 |
|
TreeHugger Robot
|
bad473d147
|
Merge "Fix RTL for Nav icons" into oc-dr1-dev
|
2017-07-25 22:35:18 +00:00 |
|
Andrew Sapperstein
|
404f96719d
|
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
am: b63b011419
Change-Id: If69caeaacd480686f5737e2f96d6804ef13ce380
|
2017-07-25 22:34:15 +00:00 |
|
Lucas Dupin
|
af12e50e00
|
Merge "Ambient indicator text color" into oc-dr1-dev
am: 5c6c7586cd -s ours
Change-Id: I7e26ad486d3478c405d2547fb43accf01a7328e5
|
2017-07-25 22:29:41 +00:00 |
|
Lucas Dupin
|
58f6bf9f59
|
Merge "resolve merge conflicts of a1f64b0a9188 to oc-mr1-dev" into oc-mr1-dev
am: fb4da9ea55
Change-Id: I48c1900df0400b4b1897cbf126a0a4539ab60f2b
|
2017-07-25 22:29:37 +00:00 |
|
TreeHugger Robot
|
fb4da9ea55
|
Merge "resolve merge conflicts of a1f64b0a9188 to oc-mr1-dev" into oc-mr1-dev
|
2017-07-25 22:21:29 +00:00 |
|
TreeHugger Robot
|
4a2a895043
|
Merge "Dump print manager as proto"
|
2017-07-25 21:35:49 +00:00 |
|
Android Build Merger (Role)
|
23a5252732
|
Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c3f71b6105 -s ours am: 76a1c8f919 -s ours"
|
2017-07-25 20:59:56 +00:00 |
|
TreeHugger Robot
|
5c3f44b631
|
Merge "Don't attemp to verify synthetic password from adb."
|
2017-07-25 20:58:40 +00:00 |
|
Bill Yi
|
c2565f1e39
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c3f71b6105 -s ours
am: 76a1c8f919 -s ours
Change-Id: Id12225d94a8b8240aba8d7a491a1ae846b919492
|
2017-07-25 20:58:26 +00:00 |
|
Bill Yi
|
76a1c8f919
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c3f71b6105 -s ours
Change-Id: I73062bba663f0c4456e626477f8a978436486dab
|
2017-07-25 20:51:53 +00:00 |
|
Sudheer Shanka
|
a5e36b158f
|
Merge "Track per-cluster times of each uid in microsec."
|
2017-07-25 20:51:24 +00:00 |
|
TreeHugger Robot
|
906d8f57bf
|
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
|
2017-07-25 20:49:39 +00:00 |
|
TreeHugger Robot
|
c3f71b6105
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
|
2017-07-25 20:45:00 +00:00 |
|
Amit Pawar
|
ddcb7f5c03
|
Merge "Fix NPE in MediaRouterService" into oc-mr1-dev am: 486b37cdac
am: 53987bf5bc
Change-Id: If7816b6ea62f159a3e0057d1ca98caf8cab23360
|
2017-07-25 20:44:08 +00:00 |
|
Amit Pawar
|
53987bf5bc
|
Merge "Fix NPE in MediaRouterService" into oc-mr1-dev
am: 486b37cdac
Change-Id: Ib83b3c0560f132067727c1c9df73a2110de83030
|
2017-07-25 20:34:15 +00:00 |
|
Bill Yi
|
e37bdbeb68
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 8fc95097b4 -s ours
am: c471fbfb65 -s ours
Change-Id: I37da1a9f893d9c047e28aaae839e7c558404fa78
|
2017-07-25 20:33:56 +00:00 |
|
Bill Yi
|
c471fbfb65
|
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 8fc95097b4 -s ours
Change-Id: I3da4a237001723ec24513c6bebea54d63ee1576f
|
2017-07-25 20:24:44 +00:00 |
|
Amit Pawar
|
486b37cdac
|
Merge "Fix NPE in MediaRouterService" into oc-mr1-dev
|
2017-07-25 20:18:52 +00:00 |
|