Xin Li
b5acbedeb6
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426 am: c8ac64aca7 am: b7f279051e
...
am: d05a06d1e2
2016-11-09 21:08:52 +00:00
Android Build Merger (Role)
675d02af78
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8 am: 68d354abce am: 3b4f8bc034 am: 4679b5553e -s ours"
2016-11-09 21:08:35 +00:00
TreeHugger Robot
c4f65e0da8
Merge "Move dump() to dumpAsync(), more oneway calls."
2016-11-09 21:08:01 +00:00
Xin Li
33449ceedf
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8 am: 68d354abce am: 3b4f8bc034
...
am: 4679b5553e
2016-11-09 21:07:38 +00:00
Xin Li
d478287ab9
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69 am: 0bf282606f
...
am: 0326b807fa
2016-11-09 21:03:17 +00:00
Xin Li
ba293f3c28
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f am: 892385f520
...
am: 4c1922b441
2016-11-09 21:02:08 +00:00
Narayan Kamath
bec3a79a27
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa am: e3d31ebc0e am: dac1d242ab
...
am: 2b3a352a4d
2016-11-09 21:00:09 +00:00
Narayan Kamath
efc25ed0e8
Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f am: 76a388b93b -s ours am: 30a6da2b14
...
am: c8044be01e
2016-11-09 20:58:59 +00:00
Xin Li
d05a06d1e2
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426 am: c8ac64aca7
...
am: b7f279051e
2016-11-09 20:57:56 +00:00
Xin Li
4679b5553e
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8 am: 68d354abce
...
am: 3b4f8bc034
2016-11-09 20:56:41 +00:00
Xin Li
0326b807fa
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours am: 4146229e69
...
am: 0bf282606f
2016-11-09 20:52:19 +00:00
Xin Li
4c1922b441
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours am: d167a27c1f
...
am: 892385f520
2016-11-09 20:51:08 +00:00
Narayan Kamath
2b3a352a4d
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa am: e3d31ebc0e
...
am: dac1d242ab
2016-11-09 20:49:08 +00:00
Narayan Kamath
c8044be01e
Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f am: 76a388b93b -s ours
...
am: 30a6da2b14
2016-11-09 20:47:09 +00:00
Xin Li
b7f279051e
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac am: 781d8f7426
...
am: c8ac64aca7
2016-11-09 20:46:08 +00:00
Xin Li
0bf282606f
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058 am: 503661118a -s ours
...
am: 4146229e69
2016-11-09 20:45:40 +00:00
Xin Li
3b4f8bc034
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081 am: 9dccfbc7c8
...
am: 68d354abce
2016-11-09 20:45:14 +00:00
Xin Li
892385f520
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2 am: 84a9614947 -s ours
...
am: d167a27c1f
2016-11-09 20:44:35 +00:00
Julia Reynolds
3aa5f1eec0
Expose dismiss reasons to notification listeners.
...
Test: see cts tests on same topic
Change-Id: Ibae45e125ebc2aa394fbdb41c00341bf0ac101e5
2016-11-09 15:43:49 -05:00
Narayan Kamath
dac1d242ab
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf am: acdb6bb1aa
...
am: e3d31ebc0e
2016-11-09 20:41:16 +00:00
Julia Reynolds
3775a39e39
Merge "Move notification channel from record to sbn."
2016-11-09 20:40:41 +00:00
Narayan Kamath
30a6da2b14
Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69 am: 4f65baa12f
...
am: 76a388b93b
2016-11-09 20:40:24 +00:00
Julia Reynolds
67c8e1e61f
Merge "Ranker --> Assistant."
2016-11-09 20:38:47 +00:00
Xin Li
4146229e69
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e am: 71e62a4058
...
am: 503661118a
2016-11-09 20:36:11 +00:00
Xin Li
c8ac64aca7
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630 am: 1a06ebfcac
...
am: 781d8f7426
2016-11-09 20:35:03 +00:00
Xin Li
d167a27c1f
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba am: 63c9a312a2
...
am: 84a9614947
2016-11-09 20:34:42 +00:00
Xin Li
68d354abce
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours am: b9634f3081
...
am: 9dccfbc7c8
2016-11-09 20:34:01 +00:00
Jeff Sharkey
97c6d3d492
Add event logging for UserState transitions.
...
Event log sticks around longer, and will help debug timing issues.
Test: builds and boots
Bug: 32719353
Change-Id: Ie19f76a341c58a8efee0eb1edbf183c22e9c5270
2016-11-09 13:31:36 -07:00
Narayan Kamath
83b46a1590
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2
...
am: 846f64c6fc
2016-11-09 20:31:32 +00:00
Narayan Kamath
f8335b6a59
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75
...
am: e82866df3f
2016-11-09 20:30:33 +00:00
Narayan Kamath
5594cfc2c3
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509
...
am: b0a7831375
2016-11-09 20:29:37 +00:00
Narayan Kamath
4c26a969e9
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6
...
am: f0cd32619e
2016-11-09 20:28:35 +00:00
Narayan Kamath
e3d31ebc0e
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am: 12f98789bf
...
am: acdb6bb1aa
2016-11-09 20:26:18 +00:00
Narayan Kamath
76a388b93b
Zygote: Additional whitelists for runtime overlay / other static resources. am: 25cd01cc69
...
am: 4f65baa12f
2016-11-09 20:25:13 +00:00
neo.chae
b4b2203c5e
Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b
...
am: 85afb42c16
2016-11-09 20:25:12 +00:00
Xin Li
503661118a
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931 am: eda0b0078e
...
am: 71e62a4058
2016-11-09 20:24:23 +00:00
Xin Li
781d8f7426
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am: 49b144e630
...
am: 1a06ebfcac
2016-11-09 20:24:23 +00:00
Xin Li
a5c82e7dd9
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb
...
am: 34de2a2d45
2016-11-09 20:24:12 +00:00
Xin Li
0a568ae56e
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours
...
am: 16090c6177
2016-11-09 20:23:04 +00:00
Xin Li
9dccfbc7c8
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am: 9b9906e9c0 -s ours
...
am: b9634f3081
2016-11-09 20:23:02 +00:00
Xin Li
84a9614947
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours am: 6166af96ba
...
am: 63c9a312a2
2016-11-09 20:23:01 +00:00
Sunny Goyal
0a1ce4237f
Merge "Fixing async inflation for nested RemoteViews"
2016-11-09 20:20:46 +00:00
Xin Li
71e62a4058
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am: cc115c5931
...
am: eda0b0078e
2016-11-09 20:17:53 +00:00
Narayan Kamath
846f64c6fc
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485
...
am: a045aed7a2
2016-11-09 20:17:01 +00:00
Xin Li
63c9a312a2
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am: ee2903686f -s ours
...
am: 6166af96ba
2016-11-09 20:17:00 +00:00
Narayan Kamath
e82866df3f
Zygote: Additional whitelisting for legacy devices. am: 7d302e018d
...
am: f369b3ce75
2016-11-09 20:16:06 +00:00
Narayan Kamath
b0a7831375
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6
...
am: fd23b9d509
2016-11-09 20:15:05 +00:00
Narayan Kamath
f0cd32619e
Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6
...
am: 1e6a5d11a6
2016-11-09 20:14:07 +00:00
Narayan Kamath
acdb6bb1aa
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev
...
am: 12f98789bf
2016-11-09 20:13:19 +00:00
Narayan Kamath
4f65baa12f
Zygote: Additional whitelists for runtime overlay / other static resources.
...
am: 25cd01cc69
2016-11-09 20:13:16 +00:00
