OSDN Git Service
Ajay Panicker [Mon, 12 Feb 2018 19:30:11 +0000 (19:30 +0000)]
Merge "AVRCP: Set maximum string length when copying to buffer" into oc-dev am:
d6836f1dae
am:
6eecab97ed
Change-Id: I52ebf76468434f8f35163eb1822ac1602878eb04
Ajay Panicker [Mon, 12 Feb 2018 19:29:45 +0000 (19:29 +0000)]
Merge "AVRCP: Initialize buffer for attribute values to be written to" into oc-dev am:
26eabd77c5
am:
78471a174a
Change-Id: I9726ffa57071c338423f5b81e3d8b364be62ca77
Ajay Panicker [Mon, 12 Feb 2018 19:29:21 +0000 (19:29 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into oc-dev am:
b8cc52c403
am:
92e778f7d5
Change-Id: I3eee3fc6088fabbb4319d1a0cb52274e90071eb1
Ajay Panicker [Mon, 12 Feb 2018 19:28:45 +0000 (19:28 +0000)]
Merge "AVRCP: Check number of text attributes in response" into oc-dev am:
ea8da12040
am:
1af6fff159
Change-Id: I11e6e3f5e947f07f81d99e491a293ee47228f531
Ajay Panicker [Mon, 12 Feb 2018 19:28:14 +0000 (19:28 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into oc-dev am:
142e752125
am:
9174514369
Change-Id: I46de8fc18a64c114b3aadda9bbadff2e6cb76c88
Ajay Panicker [Mon, 12 Feb 2018 19:24:22 +0000 (19:24 +0000)]
Merge "AVRCP: Set maximum string length when copying to buffer" into oc-dev
am:
d6836f1dae
Change-Id: I3c1f67e53bfcd0b202fab9ecaaefc0eb413c0b67
Ajay Panicker [Mon, 12 Feb 2018 19:23:54 +0000 (19:23 +0000)]
Merge "AVRCP: Initialize buffer for attribute values to be written to" into oc-dev
am:
26eabd77c5
Change-Id: Id0a63e1862d8744e1f90b37f13d2bd421545554f
Ajay Panicker [Mon, 12 Feb 2018 19:22:39 +0000 (19:22 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into oc-dev
am:
b8cc52c403
Change-Id: I3ef7630ba095f9aedde9ee4e7f16397e06041dc2
Ajay Panicker [Mon, 12 Feb 2018 19:21:16 +0000 (19:21 +0000)]
Merge "AVRCP: Check number of text attributes in response" into oc-dev
am:
ea8da12040
Change-Id: If719d0b402fd0fcaa40a890b34eca6f89fa92aca
Ajay Panicker [Mon, 12 Feb 2018 19:20:20 +0000 (19:20 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into oc-dev
am:
142e752125
Change-Id: I097d61047d05db7daf8d4142f0a57fa8536fa806
TreeHugger Robot [Mon, 12 Feb 2018 19:04:19 +0000 (19:04 +0000)]
Merge "AVRCP: Set maximum string length when copying to buffer" into oc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:59 +0000 (19:03 +0000)]
Merge "AVRCP: Initialize buffer for attribute values to be written to" into oc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]
Merge changes from topic "am-
83fa0073-1c66-42ef-b933-
72b932ba2be3" into oc-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc am:
526bef5f59 skipped:
36a9e6b339
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc am:
526bef5f59
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
TreeHugger Robot [Mon, 12 Feb 2018 19:03:19 +0000 (19:03 +0000)]
Merge "AVRCP: Check number of text attributes in response" into oc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge changes from topic "am-
fb3a89c6-818a-4835-a86a-
2acea0eee0a9" into oc-dev
* changes:
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6 am:
8d6e3ae442 skipped:
af6bae18a9
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6 am:
8d6e3ae442
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb
DO NOT MERGE: AVRCP: Check number of text attributes in response
Hansong Zhang [Sat, 10 Feb 2018 19:31:23 +0000 (19:31 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev am:
37f93de090
am:
8464a40d75
Change-Id: Id79a1f421f7a88ccabde0b99af0e5ca32d3b68d0
Hansong Zhang [Sat, 10 Feb 2018 19:30:59 +0000 (19:30 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev am:
5e84bac2be
am:
269eff697d
Change-Id: I11ba57b3e8826a0ed272286105e3262be732d849
Hansong Zhang [Sat, 10 Feb 2018 19:30:30 +0000 (19:30 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93 am:
c7f5875cf9
am:
a082cc20a9
Change-Id: I911f81a88ff9be580e1440f1c21e039ba92c394c
Hansong Zhang [Sat, 10 Feb 2018 19:27:01 +0000 (19:27 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev
am:
37f93de090
Change-Id: I9264e3749d75853a97654472216d684c9c71c9ef
Hansong Zhang [Sat, 10 Feb 2018 19:26:35 +0000 (19:26 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev
am:
5e84bac2be
Change-Id: I81f3556dc26164969361764f7877635be5010b0a
Hansong Zhang [Sat, 10 Feb 2018 19:25:58 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93
am:
c7f5875cf9
Change-Id: I4e8651a4b09314c5df7090009a28752a5661bd32
TreeHugger Robot [Sat, 10 Feb 2018 19:18:10 +0000 (19:18 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f skipped:
f83e8e01f1
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:08 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f skipped:
f83e8e01f1
Change-Id: I4456e0ddf8aa91bba685033d4e9403bec83bee07
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:06 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f
Change-Id: I2764200ea03a976eb679b4e02c4ece61115b1861
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:05 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
Change-Id: If09082226b692af642ce8e1f312e9adb6e0280a6
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:04 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
Change-Id: I2816fd435f6ffc4366ca02ad5a0beb8d9d795569
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:03 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
Change-Id: I3d96331b5aa30717f8e6be3c5fe3a91053e69cee
Hansong Zhang [Fri, 9 Feb 2018 23:23:07 +0000 (15:23 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:51 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93
Change-Id: If62106b8704dbebc76e94851a6c63a3ab2072f6f
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:50 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44
Change-Id: I2a658c40f43846b7e261233b1e1fb2db4691f9d6
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:48 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6
Change-Id: I606382f75f3ef671f4b651b2396f918a2e97d162
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:47 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2
Change-Id: I35a049b455aa485a29778f3609cc026952975484
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:46 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb
Change-Id: I051f65fd35d9cfc6329dc072fb37ab5b3820de93
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:44 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc
Change-Id: Ia5e49a4cb49329fd3a2e5b687d9e5372f88b35df
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:43 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901
Change-Id: I17e31eed9ba3a869de51e0c472dd2889bc6a951c
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:41 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda
Change-Id: Ia1ab5cc9ce36a3087eff3b7caacab41af9979c18
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:40 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88
Change-Id: I338ba0cef8c7b49da0d305a8e2e0217f19acd19c
Hansong Zhang [Fri, 9 Feb 2018 22:21:09 +0000 (14:21 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441
Hansong Zhang [Fri, 9 Feb 2018 22:16:59 +0000 (14:16 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: I8729e12ad5851ee1ffbcb7c08e9a659f768ffc21
Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:54 +0000 (21:31 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6 am:
8d6e3ae442 skipped:
af6bae18a9
Change-Id: I4a62368a93464efb6d566474cda24bec9b43a242
Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:52 +0000 (21:31 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6 am:
8d6e3ae442
Change-Id: I75c9eb9424724f9f0fff9136f8c054aa38d77ec6
Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:50 +0000 (21:31 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577 am:
b8387d01a6
Change-Id: I3eaed8b4d5edaeb45609940536effe8f82c63caf
Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:48 +0000 (21:31 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb am:
c32084e577
Change-Id: I5efb619b0fa81ceff2dbf40cb86c6e9d92ca6483
Android Build Merger (Role) [Fri, 9 Feb 2018 21:31:46 +0000 (21:31 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am:
07900311fb
Change-Id: I0e5e4ec71db8261994f64b1d1279b836b074762e
Ajay Panicker [Fri, 2 Feb 2018 08:56:43 +0000 (00:56 -0800)]
DO NOT MERGE: AVRCP: Check number of text attributes in response
Test: Build
Bug:
71603315
Change-Id: Ieda5e410057062533ae09bd977bfe7f758a55140
Ajay Panicker [Fri, 9 Feb 2018 21:18:18 +0000 (21:18 +0000)]
AVRCP: Check the number of text value attributes requested am:
6313da35ab
am:
c04bf30f51
Change-Id: Ibe9bb37ea975224c7090589e43f25a9455778013
Ajay Panicker [Fri, 9 Feb 2018 21:12:13 +0000 (21:12 +0000)]
AVRCP: Check the number of text value attributes requested
am:
6313da35ab
Change-Id: I7014801c4e9c358f198066aa05b9517cec5526ef
Ajay Panicker [Fri, 2 Feb 2018 09:26:34 +0000 (01:26 -0800)]
AVRCP: Initialize buffer for attribute values to be written to
Test: Build
Bug:
71603553
Change-Id: I978270605cfaa3b833d6c19f1b1d2cd5a82ac079
Ajay Panicker [Fri, 9 Feb 2018 08:21:06 +0000 (00:21 -0800)]
AVRCP: Set maximum string length when copying to buffer
Test: Compile
Bug:
71603262
Change-Id: I2416cdbcc3e4c5d71ab45998c02eb7cf679b1c10
Ajay Panicker [Fri, 2 Feb 2018 08:56:43 +0000 (00:56 -0800)]
AVRCP: Check number of text attributes in response
Test: Build
Bug:
71603315
Change-Id: Ieda5e410057062533ae09bd977bfe7f758a55140
Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:26 +0000 (07:52 +0000)]
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc am:
526bef5f59 skipped:
36a9e6b339
Change-Id: I422272e94533afba9d36c2c5811cb5b19778cb4c
Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:25 +0000 (07:52 +0000)]
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc am:
526bef5f59
Change-Id: I5ee00e53c6a4fa96625503ac1eddf75870e4c24f
Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:23 +0000 (07:52 +0000)]
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac am:
04674169fc
Change-Id: Id16ba673c11bb21522f8f240cc77211e33681ca1
Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:22 +0000 (07:52 +0000)]
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c am:
27c7acb0ac
Change-Id: Idb2c79340f8a89d7bda7215dc56d23a520b3c58f
Android Build Merger (Role) [Fri, 9 Feb 2018 07:52:21 +0000 (07:52 +0000)]
[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to am:
aeff2c709c
Change-Id: I94a6b930f93c51f6a3b1e71929435c8bbcc49cb8
Ajay Panicker [Fri, 2 Feb 2018 09:26:34 +0000 (01:26 -0800)]
DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
Test: Build
Bug:
71603553
Change-Id: I978270605cfaa3b833d6c19f1b1d2cd5a82ac079
Ajay Panicker [Thu, 11 Jan 2018 00:58:16 +0000 (16:58 -0800)]
AVRCP: Check the number of text value attributes requested
Test: Builds
Bug:
69479009
Change-Id: I184ddfdb56c15c2b07d52a2624240738efb4d207
Myles Watson [Wed, 7 Feb 2018 22:19:37 +0000 (22:19 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884 am:
6bb62e44cb
am:
06c43778c6
Change-Id: Icfebf1a863e7c98bde5f0ca2cf768f89ffcf6123
Myles Watson [Wed, 7 Feb 2018 22:17:00 +0000 (22:17 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev am:
168f4e7d99
am:
b075bbc371
Change-Id: I01c2dd36bacbd99d69ee7a24dc357fb7562e978b
Myles Watson [Wed, 7 Feb 2018 22:16:30 +0000 (22:16 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2 am:
4784e0f9f5
am:
47b70de56d
Change-Id: Ieae594143d0d715e7abba5e43d2713732edd2bda
Myles Watson [Wed, 7 Feb 2018 22:05:00 +0000 (22:05 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884
am:
6bb62e44cb
Change-Id: Iab9402f0e133b59728269f28ee85003f96c35997
Myles Watson [Wed, 7 Feb 2018 22:02:19 +0000 (22:02 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev
am:
168f4e7d99
Change-Id: I0001203b9de92b9dbe635fda8b1fd520f559f73c
Myles Watson [Wed, 7 Feb 2018 22:01:39 +0000 (22:01 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2
am:
4784e0f9f5
Change-Id: Id46910eb6b40977461b4ac0148f2f1de24ce1645
Myles Watson [Wed, 7 Feb 2018 21:51:49 +0000 (21:51 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb am:
02fe8680a0
am:
113b7d796e
Change-Id: I31e3d8e8c5eed0ab992c443a8beb9eeb41866218
Myles Watson [Wed, 7 Feb 2018 21:51:02 +0000 (21:51 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834 am:
a910b735ca
am:
3253d77401
Change-Id: Iab5af3febaef2c0868d33aa5174ed7d84d6486f1
Myles Watson [Wed, 7 Feb 2018 21:50:35 +0000 (21:50 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev am:
d936f1f22f
am:
e6f7fd7edd
Change-Id: I6bf5b9b85b761c3a0ddaa1f80d5e40aa8d9d457a
Myles Watson [Wed, 7 Feb 2018 21:50:05 +0000 (21:50 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev am:
50154c463a
am:
ba2c15b8c2
Change-Id: I95a60d89ad6af95e2d6b375c9d2c10274d172972
Myles Watson [Wed, 7 Feb 2018 21:49:32 +0000 (21:49 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5 am:
0544dc9d0d
am:
a3292e76a4
Change-Id: I9f2cb308de4885fbdd130fe82972a4ba44eca57a
Myles Watson [Wed, 7 Feb 2018 21:49:29 +0000 (21:49 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev
am:
206be7e884
Change-Id: I62e8fd090d35757277d49e0f2d8ad74f600559fa
Myles Watson [Wed, 7 Feb 2018 21:48:21 +0000 (21:48 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb
am:
02fe8680a0
Change-Id: I4df1b7e1434307e1799abf88c4108083c96307a6
Myles Watson [Wed, 7 Feb 2018 21:47:49 +0000 (21:47 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834
am:
a910b735ca
Change-Id: Ica72ca861c304c1a6921900d38242fe40e1dfcd7
Myles Watson [Wed, 7 Feb 2018 21:47:12 +0000 (21:47 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
am:
d936f1f22f
Change-Id: I31c1da3e1ca08ac5f697ff344ca067084ada18f8
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:41 +0000 (21:46 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:41 +0000 (21:46 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev
* changes:
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77 am:
f50146b52f
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77
Myles Watson [Wed, 7 Feb 2018 21:46:30 +0000 (21:46 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev
am:
50154c463a
Change-Id: Ia7e83c29894b0e8eb0a7669485cfabc2ae1bd00c
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:27 +0000 (21:46 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77 am:
f50146b52f
Change-Id: I5fb77e41c847564ba4f3434ae00182c8a2d3cc16
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:02 +0000 (21:46 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2
Change-Id: I3efa3017776d915345e8f80612b376b5ee7e8f81
Android Build Merger (Role) [Wed, 7 Feb 2018 21:45:59 +0000 (21:45 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3
Change-Id: I4463f4d0e21b62b49bf383e33356c7bcc4cc7868
Myles Watson [Wed, 7 Feb 2018 21:45:56 +0000 (21:45 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30 am:
136f030d24
am:
ab42c06260
Change-Id: I39856ba2096714c9a68cb65327a5e0047e8188e5
Myles Watson [Wed, 7 Feb 2018 21:45:53 +0000 (21:45 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5
am:
0544dc9d0d
Change-Id: I1fc36b9df7c7ed0528d81c8e0274407b9edb60fd
Myles Watson [Wed, 7 Feb 2018 21:45:52 +0000 (21:45 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev
am:
836d07dd77
Change-Id: Ia4d97ae4be5d06e747af9a5066421341b2a2924e
Myles Watson [Wed, 7 Feb 2018 21:45:49 +0000 (21:45 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev
am:
c6f379e4f2
Change-Id: I21bf545d257a9f6142c173de869dbad766c804d6
Myles Watson [Wed, 7 Feb 2018 21:42:27 +0000 (21:42 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev
am:
83f0c05bcb
Change-Id: Ide0d1d6f6e17a18a4e8e5a8ebab10eded62b2ef1
Myles Watson [Wed, 7 Feb 2018 21:42:24 +0000 (21:42 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev am:
30b21cde00 am:
b184d4f110
am:
540d8466ca
Change-Id: If98a5342175084cf78d4d8b1600183f4e1bbf87d
Myles Watson [Wed, 7 Feb 2018 21:42:03 +0000 (21:42 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev
am:
e285901834
Change-Id: Ie5150e770e355a36d3924c93e2dc2ffef034c3d4
Myles Watson [Wed, 7 Feb 2018 21:41:57 +0000 (21:41 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30
am:
136f030d24
Change-Id: Ib1f03a8873deb4fdc55c6ceabb843607920c2694
Myles Watson [Wed, 7 Feb 2018 21:41:55 +0000 (21:41 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into oc-dev am:
4245009354
am:
189d1b5135
Change-Id: I53f809d0fcf3130687dc13606b55c4daea9f7d4b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:58 +0000 (21:39 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
* changes:
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30 am:
e8403e2cf3
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:58 +0000 (21:39 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e skipped:
349d1fb596
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:49 +0000 (21:39 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev
* changes:
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:45 +0000 (21:39 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30 am:
e8403e2cf3
Change-Id: I1bb052f71ab88caf5628c594ba4169082b476218
Myles Watson [Wed, 7 Feb 2018 21:39:25 +0000 (21:39 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev am:
30b21cde00
am:
b184d4f110
Change-Id: I4e3c614fa2847bdc4005bd1e284df3c595508104
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:08 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e skipped:
349d1fb596
Change-Id: Iea1c1e5a791b6ee03714e23daafc317b8b4b670b
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:06 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7 am:
7781bec06e
Change-Id: I8c52ee09952bb03da09418a86a7865070177fbdd
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:04 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041 am:
a4c2f193e7
Change-Id: I6393804bc9845ac8cd3f62f38df52206dd62cbcc
Android Build Merger (Role) [Wed, 7 Feb 2018 21:39:03 +0000 (21:39 +0000)]
[automerger] Merge "DO NOT MERGE: SDP: Check p_req_end before reading from p_req" into nyc-dev am:
87d9e19727 am:
b2f4b51041
Change-Id: I5bb77085b74b30710f7c4eb41f4a183ee46ab37b