Brad Ebinger
|
bb38194a55
|
Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971
am: 014d73e287
Change-Id: I7c7dc265bf5ba27b61794d114937c2c4c0816470
|
2017-10-11 22:56:47 +00:00 |
|
Jeff Sharkey
|
6530612cee
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp
am: 6ef8866b04
Change-Id: Ic989ee531576564282dbc4ab065f4dd6b99a6c4c
|
2017-10-11 22:42:20 +00:00 |
|
Brad Ebinger
|
014d73e287
|
Merge "Add new Download Error Codes" am: e9bd5449b5
am: 946ff79971
Change-Id: I756df5c78a96a59468f54ac35e9668d66cf64901
|
2017-10-11 22:39:14 +00:00 |
|
Android Build Merger (Role)
|
da968fb57f
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849 am: 5712d1fb47" into oc-mr1-dev-plus-aosp
|
2017-10-11 22:28:09 +00:00 |
|
Jeff Sharkey
|
6694c5c6f0
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849
am: 5712d1fb47
Change-Id: Id5d6dd68924837f09d6f2b1178ce41c2d1e81219
|
2017-10-11 22:26:38 +00:00 |
|
Brad Ebinger
|
946ff79971
|
Merge "Add new Download Error Codes"
am: e9bd5449b5
Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
|
2017-10-11 22:24:58 +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 |
|
Android Build Merger (Role)
|
6ef8866b04
|
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp
|
2017-10-11 22:14:32 +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 |
|
Brad Ebinger
|
e9bd5449b5
|
Merge "Add new Download Error Codes"
|
2017-10-11 22:12:26 +00:00 |
|
Jeff Sharkey
|
5712d1fb47
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf
am: a7f0504849
Change-Id: Ib17c9471d7f3bdde18e3de4ad693fd9ef5312059
|
2017-10-11 22:11:51 +00:00 |
|
Jeff Sharkey
|
a54bfed476
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf
am: a7f0504849
Change-Id: I08b0a31acd8044b1fb1676052f853bbc1b1201a1
|
2017-10-11 22:11:49 +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 |
|
Jeff Sharkey
|
a7f0504849
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours
am: 3b47256ccf
Change-Id: Ie321b5922ec83367ec93e528993fb205ebcad1ac
|
2017-10-11 21:52:08 +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
|
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
|
3b47256ccf
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a
am: 97f6a0da40 -s ours
Change-Id: Icd0d048be2d037fa19befb94ccd8d6fda26bee74
|
2017-10-11 21:34:24 +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 |
|
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 |
|
Jeff Sharkey
|
97f6a0da40
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c
am: da3d10591a
Change-Id: I22ddd0fb81ca1acdb070a5872b4c0a31e197e15b
|
2017-10-11 21:24:41 +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 |
|
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
|
da3d10591a
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0
am: 72df97053c
Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3
|
2017-10-11 21:12:09 +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 |
|
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
|
72df97053c
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a
am: 4a60106aa0
Change-Id: Iaace5d103229b9028d1b81602107af35857ca55c
|
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 |
|
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 |
|
Jeff Sharkey
|
4a60106aa0
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev
am: 254369967a
Change-Id: I511e6d122a5717b36ad78d8100ed728ef862adff
|
2017-10-11 20:34:48 +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 |
|
Jeff Sharkey
|
5f17a285f9
|
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev
am: 09984216e6 -s ours
Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120
|
2017-10-11 20:30:25 +00:00 |
|