Commit Graph

2387 Commits

Author SHA1 Message Date
Android Build Merger (Role)
8fe7450448 Merge "[automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours am: f3d4af802c -s ours am: 14b3dd4079 -s ours am: 7f6143aba5" into pi-dev-plus-aosp 2018-04-10 01:12:06 +00:00
Ray Essick
03edbe306e [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours am: f3d4af802c -s ours am: 14b3dd4079 -s ours
am: 7f6143aba5

Change-Id: Ib927d753d8315df79c5c3ffc9ef6aa4093a48515
2018-04-09 18:11:54 -07:00
Ray Essick
da02272c04 Merge changes from topic "am-d07fe6158f29422e98a40e093be6fb1d" am: 6c946d6275
am: 2139d17775

Change-Id: I5896ce2e4006f25a93866f4f74f46004eec9c345
2018-04-09 18:11:09 -07:00
Ray Essick
4ccba3e8a1 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours am: b591008bc2 -s ours am: 8cda702a5a -s ours
am: 8b83e5ce28  -s ours

Change-Id: I7f589a52ade3681f616e765c97462f5786def7e0
2018-04-09 18:07:17 -07:00
Ray Essick
1e7206f160 Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f am: b5c3d08260
am: a0bc089548

Change-Id: Id21cc3d0b0a7b7bbb952df2821b744b4ebc07be4
2018-04-09 18:03:44 -07:00
Ray Essick
fe7d058185 Merge changes from topic "am-16b0b195e940437c988164c18e28c9c8" am: 2a559a04cd
am: 02c310f568

Change-Id: Ibfa12caa78f809e1588d9dd4640022a7d31b155f
2018-04-09 17:56:47 -07:00
Ray Essick
14a6b1c1ef [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours am: 3ace7af527 -s ours am: 2040949cb3 -s ours
am: 4aa69908c2  -s ours

Change-Id: Idb38e5cc4256b507785c78fc13c20314f52f276b
2018-04-09 17:52:43 -07:00
Ray Essick
51587bee83 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours am: 2a60c1ea48 -s ours
am: ababc876d2

Change-Id: I97d8f91a6cfdcb4433ce70c903a45976c1a8bdc1
2018-04-09 17:23:23 -07:00
Android Merger
6c946d6275 Merge changes from topic "am-d07fe6158f29422e98a40e093be6fb1d"
* changes:
  Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev am: 16af42313d
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours am: bafd18446f  -s ours am: 72b96b0354  -s ours am: b591008bc2  -s ours
2018-04-10 00:22:06 +00:00
Ray Essick
7b8e19fb76 Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
am: 16af42313d

Change-Id: I7568d330852e6b103af5aca99619cda9cfefa8d8
2018-04-09 17:21:55 -07:00
Ray Essick
d208ddaa14 Merge changes from topic "am-d23ca51b7f164fc892e8bdfd6febf406" am: 52525a8839
am: 7ae46dad83

Change-Id: I068637a3734a63fe843d6add916653b4ff58dd8a
2018-04-09 17:21:49 -07:00
Ray Essick
416fa992a9 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours am: 26d4c1f151 -s ours am: 00eb32582d -s ours
am: af5b3958ae  -s ours

Change-Id: I9850b877597ce963d9bff29641673ae1333c8482
2018-04-09 17:18:18 -07:00
Ray Essick
8cda702a5a [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours am: 72b96b0354 -s ours
am: b591008bc2  -s ours

Change-Id: Id2cd89dae283270d5a88a7c42b0f2cbdc311e9a6
2018-04-09 17:14:34 -07:00
Ray Essick
bd51d01139 Merge changes from topic "am-2dd7b4ef33fc46ddac7eb3610aab4ec8" am: 1a07cdce11
am: cd3957ee75

Change-Id: Ic58bacb77b750307173fd8dfc6edaacd6126c454
2018-04-09 17:08:07 -07:00
Android Merger
16af42313d Merge changes from topic "am-1040f2fedf9f49a9a38f5d0878c0a1d0" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev am: dbfdb95147
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours am: bafd18446f  -s ours am: 72b96b0354  -s ours
2018-04-10 00:04:01 +00:00
Ray Essick
3cca65faac Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
am: dbfdb95147

Change-Id: I2aea8818706cfa197efaccd62152c57d078de93c
2018-04-09 17:03:48 -07:00
Ray Essick
170d735f6e [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours am: f3d4af802c -s ours am: eba4cb5e97 -s ours
am: 75b1d37e37  -s ours

Change-Id: I2191222a56bf3642b742a6a880b692f57579001b
2018-04-09 17:02:22 -07:00
Ray Essick
b591008bc2 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours am: bafd18446f -s ours
am: 72b96b0354  -s ours

Change-Id: I53fee208998ce3d62bd58e5280c3cbbe147d8c45
2018-04-09 16:59:06 -07:00
Android Merger
dbfdb95147 Merge changes from topic "am-ce014dceeecf45abb673c6f026ccf980" into oreo-cts-dev
* changes:
  Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev am: 8ef12d94da
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours am: bafd18446f  -s ours
2018-04-09 23:51:21 +00:00
Ray Essick
793b437465 Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
am: 8ef12d94da

Change-Id: I296d1bd01c211fb769e6a7da3d10bf8c91ffcb2d
2018-04-09 16:51:06 -07:00
Ray Essick
72b96b0354 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours am: afb3e84599 -s ours
am: bafd18446f  -s ours

Change-Id: I32d61ceb0610ed88bfeb574624e6df0a655bd458
2018-04-09 16:48:16 -07:00
Android Merger
8ef12d94da Merge changes from topic "am-c4615261ef624ee49e66b0c52ff3f69c" into nougat-mr1-cts-dev
* changes:
  Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev am: 1fd90c968d
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours am: afb3e84599  -s ours
2018-04-09 23:43:56 +00:00
Ray Essick
dfc472585a Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
am: 1fd90c968d

Change-Id: I19327405fc5eb081741a140637b531b265683ce7
2018-04-09 16:43:45 -07:00
Ray Essick
7f6143aba5 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours am: f3d4af802c -s ours
am: 14b3dd4079  -s ours

Change-Id: I5e5b9f0398fb34ba263bd5fbe9a4299bf0bd41f7
2018-04-09 16:43:25 -07:00
Ray Essick
a0bc089548 Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f
am: b5c3d08260

Change-Id: Id3a47db521327b32843cb68e6ff10b89f0f23828
2018-04-09 16:41:52 -07:00
Ray Essick
bafd18446f [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
am: afb3e84599  -s ours

Change-Id: Iefbef63bc6c5cd09ce6b949f31e8a3fd8c822a15
2018-04-09 16:41:51 -07:00
Ray Essick
ababc876d2 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours
am: 2a60c1ea48  -s ours

Change-Id: I35d5e215f55614c4bb549d6dc36034163cddc6e0
2018-04-09 16:34:20 -07:00
Android Merger
1fd90c968d Merge changes from topic "am-157f76c7fc0b4412b75bfe4f38cb6b0f" into nougat-cts-dev
* changes:
  Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715  -s ours
2018-04-09 23:33:47 +00:00
Ray Essick
27fec8a834 Merge changes from topic "am-d40b1053bf0542f084ff203cf4297e08" am: 7f66d8d286
am: 618bbf146b

Change-Id: Ib90a5a7ca709fbb071a4563dc818c0b993ede2af
2018-04-09 16:33:45 -07:00
Ray Essick
bcd58bb50a Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
am: 7f0c5e7da8

Change-Id: I1db217fe93ba600f5a732aa8418705f2133af020
2018-04-09 16:33:28 -07:00
Ray Essick
afb3e84599 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: 2215338715  -s ours

Change-Id: I9d60b68be04ed4f32a782ba09f406b2953f4938b
2018-04-09 16:33:05 -07:00
Ray Essick
73b129ec13 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121 -s ours am: d0ff8fbabb -s ours
am: 52211eb32f  -s ours

Change-Id: I1832558dfd5d2a2b4f716a4d9d7db45c9ba25098
2018-04-09 16:30:39 -07:00
Treehugger Robot
7f0c5e7da8 Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394
2018-04-09 23:26:06 +00:00
Ray Essick
14b3dd4079 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours
am: f3d4af802c  -s ours

Change-Id: Ie1ce0237b3eed4b170a4cf87e0387ce7aaac4673
2018-04-09 16:18:39 -07:00
Android Merger
2a559a04cd Merge changes from topic "am-16b0b195e940437c988164c18e28c9c8"
* changes:
  Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev am: f0c2985ba8
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours am: 308f60a04c  -s ours am: 3ace7af527  -s ours
2018-04-09 23:17:39 +00:00
Ray Essick
d3937d2d27 Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
am: f0c2985ba8

Change-Id: I3e33fc2e58cccd07cdd4475e5abf50824072ae48
2018-04-09 16:17:28 -07:00
Ray Essick
b5c3d08260 Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
am: f5e53a396f

Change-Id: I03ecdfbb20e5b882332e7a018fed9b6969990974
2018-04-09 16:13:03 -07:00
Ray Essick
2a60c1ea48 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454
am: ac5b691121  -s ours

Change-Id: I68bd2d8587558b601681d0a46b22c6f30cb9fa62
2018-04-09 16:12:37 -07:00
Ray Essick
2040949cb3 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours am: 308f60a04c -s ours
am: 3ace7af527  -s ours

Change-Id: Ic435e9365fbb61b0bdaa8096513f756136433b85
2018-04-09 16:11:03 -07:00
Android Merger
52525a8839 Merge changes from topic "am-d23ca51b7f164fc892e8bdfd6febf406"
* changes:
  Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev am: f095afee74
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f  -s ours am: 26d4c1f151  -s ours
2018-04-09 23:05:14 +00:00
Ray Essick
749318c148 Merge changes from topic "am-255f7edfcc6f4ec1a5498250fdcf0dc9" into oreo-mr1-cts-dev
am: f095afee74

Change-Id: Idff151e5b917ffdcd35cf25a674ba42f1903ca51
2018-04-09 16:04:27 -07:00
Ray Essick
00eb32582d [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ae91a6ad6f -s ours
am: 26d4c1f151  -s ours

Change-Id: I395b7562f3b6b46c42dc27f6006f5a41ca8f39a3
2018-04-09 16:00:28 -07:00
Android Merger
f0c2985ba8 Merge changes from topic "am-96d8ccc4e1e44c30aec62bb030c6529c" into oreo-mr1-cts-dev
* changes:
  Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev am: 1c90ff8dcf
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74  -s ours am: 81f274ebb2  -s ours am: 308f60a04c  -s ours
2018-04-09 22:53:51 +00:00
Ray Essick
d9a966f2f9 Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
am: 1c90ff8dcf

Change-Id: Ia6a800ccdc908776040c2d9b2a793fbdb2e174fc
2018-04-09 15:53:38 -07:00
Android Merger
1a07cdce11 Merge changes from topic "am-2dd7b4ef33fc46ddac7eb3610aab4ec8"
* changes:
  Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev am: 666f941b5a
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours am: f3d4af802c  -s ours
2018-04-09 22:50:35 +00:00
Ray Essick
e50a8571cb Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
am: 666f941b5a

Change-Id: Ia4f0cd73ea201ba4fe8ad827712d4a34746bec21
2018-04-09 15:50:14 -07:00
Ray Essick
3ace7af527 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: b32ca8fa74 -s ours am: 81f274ebb2 -s ours
am: 308f60a04c  -s ours

Change-Id: I2c54e0109d53efdeff69279f0c796d5bf103a58e
2018-04-09 15:48:01 -07:00
Ray Essick
eba4cb5e97 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56 -s ours am: 8dd2d10a1b -s ours
am: f3d4af802c  -s ours

Change-Id: Iaf42de1c60bf096cf31edbf0ed60586aa42b85d5
2018-04-09 15:43:48 -07:00
Android Merger
7f66d8d286 Merge changes from topic "am-d40b1053bf0542f084ff203cf4297e08"
* changes:
  Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: ac5b691121  -s ours
2018-04-09 22:40:10 +00:00
Ray Essick
6e26a15b5d Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev
am: f5e53a396f

Change-Id: I1badabd184e729031a7279cbc31c5c4c6449d591
2018-04-09 15:39:57 -07:00