Dan Albert
|
cd4e159bbf
|
Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 am: e9aaf3c546
am: caebafaf94
Change-Id: I5ec663813ede4bb794691ecb5e9afc0140accb84
|
2017-10-11 22:56:45 +00:00 |
|
Jeff Sharkey
|
ff40949f5b
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: e2a1e9f7d8" into oc-mr1-dev-plus-aosp
am: 54bfe3acdd -s ours
Change-Id: I75c61202b938d1cdf61755877d1ecbfb9191ddea
|
2017-10-11 22:48:29 +00:00 |
|
Jeff Sharkey
|
d8a053cda2
|
Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp
am: 289b4d8c53 -s ours
Change-Id: Id4fe5d06de655a44e1b0a40aed44acc32df3b30e
|
2017-10-11 22:37:44 +00:00 |
|
Jeff Sharkey
|
6f2ab66f45
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp
am: a04a837f95 -s ours
Change-Id: I6ea442a00fe0ca7a6af767ae427a0d2b8256b42c
|
2017-10-11 22:33:05 +00:00 |
|
Jean-Michel Trivi
|
900699c173
|
Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp
am: fd77afd548
Change-Id: I9ed6b346f9f81a338169628d9e2c955421560744
|
2017-10-11 22:28:57 +00:00 |
|
Dan Albert
|
caebafaf94
|
Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4
am: e9aaf3c546
Change-Id: I41e4375d053ad5aa64bd4ca3a78b23644b2c725b
|
2017-10-11 22:22:04 +00:00 |
|
Android Build Merger (Role)
|
54bfe3acdd
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: e2a1e9f7d8" into oc-mr1-dev-plus-aosp
|
2017-10-11 22:16:07 +00:00 |
|
Jeff Sharkey
|
e8af749eec
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194 am: 8bfef31ce0
am: c4649e252d -s ours
Change-Id: I874d8afcbd14d28bf7ade224fc7cb72093482e1d
|
2017-10-11 22:15:44 +00:00 |
|
Jeff Sharkey
|
b969ac5fd0
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6
am: e2a1e9f7d8
Change-Id: I7a72aa1793c5e45434f50c4d810164fbbfd70ef9
|
2017-10-11 22:13:37 +00:00 |
|
Dan Albert
|
e9aaf3c546
|
Merge "Add missing includes." am: 4be4bb3db7
am: 41c08f49b4
Change-Id: I67b30cd624fe42521097c20cc45ee6db19c0d43e
|
2017-10-11 22:07:46 +00:00 |
|
Android Build Merger (Role)
|
289b4d8c53
|
Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp
|
2017-10-11 22:06:40 +00:00 |
|
Jeff Sharkey
|
e3e396ac41
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev
am: 383ab095f5
Change-Id: Ic1d6542b99aa8e559c17826a32ed128610c964b0
|
2017-10-11 22:02:35 +00:00 |
|
Android Build Merger (Role)
|
a04a837f95
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp
|
2017-10-11 21:59:03 +00:00 |
|
Jeff Sharkey
|
2771394e89
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6
am: 0de1d85a01
Change-Id: I61273206efb364da1317666b199fda6a0ecb5c12
|
2017-10-11 21:56:49 +00:00 |
|
Dan Albert
|
41c08f49b4
|
Merge "Add missing includes."
am: 4be4bb3db7
Change-Id: Icdae2b63df8e5d61e6acabb6fb85efa28026d535
|
2017-10-11 21:52:41 +00:00 |
|
Android Build Merger (Role)
|
fd77afd548
|
Merge "Merge "Fix alarm preview volume" into oc-mr1-dev am: b9629cd432" into oc-mr1-dev-plus-aosp
|
2017-10-11 21:50:42 +00:00 |
|
Jeff Sharkey
|
c4649e252d
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194
am: 8bfef31ce0
Change-Id: I79106ed066b76f9597d74e56498fa3a9c6258f7f
|
2017-10-11 21:48:19 +00:00 |
|
Jean-Michel Trivi
|
47aa351692
|
Merge "Fix alarm preview volume" into oc-mr1-dev
am: b9629cd432
Change-Id: If5bc5bbdb5239609db61e4706c6b2395b0231f83
|
2017-10-11 21:48:00 +00:00 |
|
Jeff Sharkey
|
3700554d86
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e0e1c8ae4c
am: b49d357915 -s ours
Change-Id: Ib8d2efccb01873827335ca6eece42ca738b67e0c
|
2017-10-11 21:43:30 +00:00 |
|
Android Build Merger (Role)
|
dc5d89e59a
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb am: 4a69ee914c -s ours"
|
2017-10-11 21:38:31 +00:00 |
|
Jeff Sharkey
|
e2a1e9f7d8
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3
am: 4a71a2daf6
Change-Id: Id8a401121d8bff24b5695f0ad0d4c923da93995c
|
2017-10-11 21:38:30 +00:00 |
|
Treehugger Robot
|
4be4bb3db7
|
Merge "Add missing includes."
|
2017-10-11 21:37:28 +00:00 |
|
Jeff Sharkey
|
0de1d85a01
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3
am: 4a71a2daf6
Change-Id: I0fef13605c0a2da1b787bc11ac4ec06926665ba2
|
2017-10-11 21:36:45 +00:00 |
|
Jeff Sharkey
|
68408918c2
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb
am: 4a69ee914c -s ours
Change-Id: Id50190ce08ae0d0f1e417db0f7290b3c7ea5c2fe
|
2017-10-11 21:35:48 +00:00 |
|
Jeff Sharkey
|
b49d357915
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9
am: e0e1c8ae4c
Change-Id: I4ace250ae2b4998e7c77f361dddd47f815b9ad27
|
2017-10-11 21:32:36 +00:00 |
|
Bryce Lee
|
fd39b2375f
|
Merge "Initial tests for launch bounds."
|
2017-10-11 21:29:56 +00:00 |
|
TreeHugger Robot
|
f65d166959
|
Merge "Removed remaining use of static stack ids."
|
2017-10-11 21:27:05 +00:00 |
|
Android Build Merger (Role)
|
383ab095f5
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev
|
2017-10-11 21:26:04 +00:00 |
|
Android Build Merger (Role)
|
6ecf046c45
|
Merge "Merge "Check target api version before crashing apps." into oc-mr1-dev am: 4e733f3074 am: c1bcf2ff95"
|
2017-10-11 21:23:45 +00:00 |
|
Jeff Sharkey
|
4a69ee914c
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9
am: e6f60d0fcb
Change-Id: Ia9d41c8a74dd6862e27c9712ff404efa75caeda4
|
2017-10-11 21:23:11 +00:00 |
|
Jeff Sharkey
|
69e02608d5
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279
am: 3f671b3194
Change-Id: I16c9f75cf0181b834cbfa1a7e716aaced2768c5e
|
2017-10-11 21:21:51 +00:00 |
|
Julia Reynolds
|
d0263a73c1
|
Merge "Check target api version before crashing apps." into oc-mr1-dev am: 4e733f3074
am: c1bcf2ff95
Change-Id: I3d8003a0a4f1c2917af1aae93575672fcbf10e74
|
2017-10-11 21:20:55 +00:00 |
|
TreeHugger Robot
|
7f02d9c67c
|
Merge "Don't proguard FrameworksServicesTests"
|
2017-10-11 21:20:17 +00:00 |
|
TreeHugger Robot
|
b9629cd432
|
Merge "Fix alarm preview volume" into oc-mr1-dev
|
2017-10-11 21:19:54 +00:00 |
|
Jeff Sharkey
|
8bfef31ce0
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279
am: 3f671b3194
Change-Id: I9abdd6f2df64398385a98686d66c4c043939adc6
|
2017-10-11 21:19:01 +00:00 |
|
Jeff Sharkey
|
4a71a2daf6
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours
am: 7f108b81b3
Change-Id: I87e6ae95c5a4be28cd268bac73548de83cf61ed6
|
2017-10-11 21:18:21 +00:00 |
|
Jeff Sharkey
|
e6f60d0fcb
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9
am: 98371ee7c9
Change-Id: I02c6f8314289abbc0639c634c478f293ecd1d679
|
2017-10-11 21:04:06 +00:00 |
|
Jeff Sharkey
|
e0e1c8ae4c
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9
am: 98371ee7c9
Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5
|
2017-10-11 21:03:59 +00:00 |
|
Jeff Sharkey
|
7f108b81b3
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2
am: e1ae848970 -s ours
Change-Id: Ic511d47f88b86fa999beae0363da07ee4fc1a3be
|
2017-10-11 21:00:20 +00:00 |
|
Jeff Sharkey
|
3f671b3194
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
am: 31c5adc279
Change-Id: Id9a5a0216f1f26e059df45cc866582fe04cdf47d
|
2017-10-11 20:57:08 +00:00 |
|
Julia Reynolds
|
c1bcf2ff95
|
Merge "Check target api version before crashing apps." into oc-mr1-dev
am: 4e733f3074
Change-Id: I41d02093b1a471123e4dffd90da8cacffa23e769
|
2017-10-11 20:54:39 +00:00 |
|
Bill Yi
|
3cf1a94524
|
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp
am: 9ba5681aec -s ours
Change-Id: I43bac3255871563f4126d119d068cf2f9b1f56e7
|
2017-10-11 20:53:19 +00:00 |
|
Bill Yi
|
051049b305
|
Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: 311fa22ecb -s ours
am: 17b8aa19c7 -s ours
Change-Id: I890ec538e87d154704ef315896d8e420d79327e0
|
2017-10-11 20:48:36 +00:00 |
|
Jeff Sharkey
|
e1ae848970
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c
am: b4d23d55c2
Change-Id: Idfcdf295be77c9ab39d790e7793d2d772c92f9f7
|
2017-10-11 20:47:31 +00:00 |
|
Jeff Sharkey
|
98371ee7c9
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours
am: 5f17a285f9
Change-Id: I9971bfff1c0792f78e4afe17a101ba6e6ae0cd2f
|
2017-10-11 20:46:21 +00:00 |
|
TreeHugger Robot
|
4e733f3074
|
Merge "Check target api version before crashing apps." into oc-mr1-dev
|
2017-10-11 20:37:04 +00:00 |
|
TreeHugger Robot
|
c5df65697c
|
Merge "Don't trigger strict mode for shortcut manager bitmap compression"
|
2017-10-11 20:35:50 +00:00 |
|
Jeff Sharkey
|
b4d23d55c2
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev
am: 9d3706046c
Change-Id: I46ef6e731af52bd7404e580f85611804abb8bcef
|
2017-10-11 20:34:50 +00:00 |
|
TreeHugger Robot
|
31c5adc279
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev
|
2017-10-11 20:34:39 +00:00 |
|
Android Build Merger (Role)
|
9ba5681aec
|
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am: 1018a5d4a1 -s ours am: ae4dc78421 -s ours" into oc-mr1-dev-plus-aosp
|
2017-10-11 20:33:34 +00:00 |
|