OSDN Git Service

android-x86/system-bt.git
6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Hansong Zhang [Fri, 6 Apr 2018 22:18:48 +0000 (15:18 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c am: d58ad85a12 am: cd6784f464 am: 7fa0bf6106 skipped: 6f49839d7b
am: 0aaeaf661c

Change-Id: Ibcc5d6fc270ecc52ab3c2bc1e161fbd528ae51a5

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:32 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c am: d58ad85a12 am: cd6784f464 am: 7fa0bf6106 skipped: 6f49839d7b

Change-Id: I34bc2e4a1ffaddaa715d6ca93702bf71d041141a

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:30 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c am: d58ad85a12 am: cd6784f464 am: 7fa0bf6106

Change-Id: I1abe8e714705eb6c74608c2e608c7dc747b175f1

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:29 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c am: d58ad85a12 am: cd6784f464

Change-Id: Ia05aec96a9297845ed8f998f34507faf2eb562aa

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:27 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c am: d58ad85a12

Change-Id: I2d9e1e774d5694163049a52119fbd67b1ac4b718

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:26 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42 am: 8fd38dcd3c

Change-Id: Ic8a22969dc8b52582eea14f731c00cf0463bd024

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:25 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c skipped: 37a3914a42

Change-Id: I608a9e64ae1882c318a8bc8f2710990679b496a0

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:23 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb am: f5960e961c

Change-Id: Id9f1cb41fde0ced026415ecf20766edd5df593ca

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74...
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:22 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74 am: d9af1fffcb

Change-Id: Id73dfb4249a191a95a30edf5e43948c6fcafedb6

6 years ago[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:20 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am: 040aa7be74

Change-Id: I7c3bc0a75233b759ae029dd7297ea8f77db59723

6 years agoDO NOT MERGE Fix unexpected behavior in smp_sm_event
Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]
DO NOT MERGE Fix unexpected behavior in smp_sm_event

Bug: 74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
Ajay Panicker [Tue, 13 Feb 2018 00:45:03 +0000 (00:45 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884 am: d4b8f56f02 am: bde10cf7d9 am: 3fa6938ad7 skipped: 99b48162a3
am: ba32c74024

Change-Id: I2d64b0ca170d70f194315ee831379477c809fe95

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:29 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884 am: d4b8f56f02 am: bde10cf7d9 am: 3fa6938ad7 skipped: 99b48162a3

Change-Id: I3a030575253b8e4ef8ce8fb9e8302c84584809f8

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:26 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884 am: d4b8f56f02 am: bde10cf7d9 am: 3fa6938ad7

Change-Id: I393094413a4eb635cd80aaa7b7dc74fac8e5dbc0

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:23 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884 am: d4b8f56f02 am: bde10cf7d9

Change-Id: Ic0722cf7a7ca48da60055a050fcb8f924fb18f13

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:20 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884 am: d4b8f56f02

Change-Id: I7d25a311a384582bbe03a7f6d7076ba07788b30a

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response...
Android Build Merger (Role) [Mon, 12 Feb 2018 20:56:17 +0000 (20:56 +0000)]
[automerger] DO NOT MERGE: AVRCP: Check number of text attribute values in response am: 8a6fb36884

Change-Id: I895844919dbff48a2290b717974cd76b58da541b

6 years agoDO NOT MERGE: AVRCP: Check number of text attribute values in response
Ajay Panicker [Fri, 2 Feb 2018 09:11:37 +0000 (01:11 -0800)]
DO NOT MERGE: AVRCP: Check number of text attribute values in response

Test: Build
Bug: 71603410
Change-Id: I6f822b0bc7fc2fb042a70b64cff61583a86b36e2

6 years agoMerge "AVRCP: Check number of text attribute values in response" into oc-dev
Ajay Panicker [Mon, 12 Feb 2018 20:20:24 +0000 (20:20 +0000)]
Merge "AVRCP: Check number of text attribute values in response" into oc-dev
am: 49dd35ac08

Change-Id: Ic7c84b59fcb22988d8f2cbdc1ee214281d10875d

6 years agoMerge "AVRCP: Check number of text attribute values in response" into oc-dev
TreeHugger Robot [Mon, 12 Feb 2018 20:05:21 +0000 (20:05 +0000)]
Merge "AVRCP: Check number of text attribute values in response" into oc-dev

6 years agoMerge "AVRCP: Set maximum string length when copying to buffer" into oc-dev
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

6 years agoMerge "AVRCP: Initialize buffer for attribute values to be written to" into oc-dev
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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into oc-dev
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

6 years agoMerge "AVRCP: Check number of text attributes in response" into oc-dev
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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into oc-dev
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

6 years agoMerge "AVRCP: Set maximum string length when copying to buffer" into oc-dev
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

6 years agoMerge "AVRCP: Initialize buffer for attribute values to be written to" 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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into nyc-mr2-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 nyc-mr2-dev

* changes:
  [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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into cw-f-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 cw-f-dev

* changes:
  [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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into nyc-mr1-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 nyc-mr1-dev

* changes:
  [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

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" into nyc-dr1-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 nyc-dr1-dev

* changes:
  [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

6 years agoMerge "DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written...
TreeHugger Robot [Mon, 12 Feb 2018 19:03:46 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to" into nyc-dev

6 years agoMerge changes from topic "am-83fa0073-1c66-42ef-b933-72b932ba2be3" 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

6 years agoMerge "AVRCP: Check number of text attributes in response" into oc-dev
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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" 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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into nyc-mr2-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 nyc-mr2-dev

* changes:
  [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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into cw-f-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 cw-f-dev

* changes:
  [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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into nyc-mr1-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 nyc-mr1-dev

* changes:
  [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

6 years agoMerge changes from topic "am-fb3a89c6-818a-4835-a86a-2acea0eee0a9" into nyc-dr1-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 nyc-dr1-dev

* changes:
  [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

6 years agoMerge "DO NOT MERGE: AVRCP: Check number of text attributes in response" into nyc-dev
TreeHugger Robot [Mon, 12 Feb 2018 19:03:09 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: AVRCP: Check number of text attributes in response" into nyc-dev

6 years agoMerge "DO NOT MERGE Truncate new line characters when adding string to config" into...
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

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into oc-dev
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years agoMerge "DO NOT MERGE Truncate new line characters when adding string to config" into...
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

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc...
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 nyc-mr2-dev

* changes:
  [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

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into cw...
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 cw-f-dev

* changes:
  [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

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc...
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 nyc-mr1-dev

* changes:
  [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

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" into nyc...
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 nyc-dr1-dev

* changes:
  [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

6 years agoMerge "DO NOT MERGE Truncate new line characters when adding string to config" into...
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into nyc-dev

6 years agoMerge changes from topic "am-c41d9dbf-12e7-4386-8be3-987a152ba46e-nyc-dev" 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

6 years ago[automerger] 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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years agoDO NOT MERGE Truncate new line characters when adding string to config
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years ago[automerger] DO NOT MERGE Truncate new line characters when adding string to config...
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

6 years agoDO NOT MERGE Truncate new line characters when adding string to config
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

6 years agoDO NOT MERGE Truncate new line characters when adding string to config
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Check number of text attributes in response am...
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

6 years agoDO NOT MERGE: AVRCP: Check number of text attributes in response
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

6 years agoAVRCP: Check the number of text value attributes requested
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

6 years agoAVRCP: Initialize buffer for attribute values to be written to
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

6 years agoAVRCP: Set maximum string length when copying to buffer
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

6 years agoAVRCP: Check number of text attribute values in response
Ajay Panicker [Fri, 2 Feb 2018 09:11:37 +0000 (01:11 -0800)]
AVRCP: Check number of text attribute values in response

Test: Build
Bug: 71603410
Change-Id: I6f822b0bc7fc2fb042a70b64cff61583a86b36e2

6 years agoAVRCP: Check number of text attributes in response
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years ago[automerger] DO NOT MERGE: AVRCP: Initialize buffer for attribute values to be writte...
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

6 years agoDO NOT MERGE: AVRCP: Initialize buffer for attribute values to be written to
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

6 years agoAVRCP: Check the number of text value attributes requested
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

6 years agoMerge "Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev...
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

6 years agoMerge changes from topic "am-e4209b1fdb924afeb6b600eabca4a64d" into oc-dev
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

6 years ago[automerger] Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into...
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

6 years agoMerge "Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev...
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

6 years agoMerge "Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into cw...
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

6 years agoMerge changes from topic "am-123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am...
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

6 years agoMerge changes from topic "am-a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
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

6 years agoMerge "Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev...
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

6 years agoMerge changes from topic "am-e4209b1fdb924afeb6b600eabca4a64d" into oc-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

6 years agoMerge changes from topic "am-123d1192465c41d68296e6dc685616c6" into oc-dev
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

6 years ago[automerger] Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into...
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

6 years ago[automerger] Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into...
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

6 years ago[automerger] Merge changes from topic "am-123d1192465c41d68296e6dc685616c6" into...
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

6 years ago[automerger] Merge changes from topic "am-821a1757-819d-4571-9800-4f85fda8b125" into...
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

6 years agoMerge changes from topic "am-123d1192465c41d68296e6dc685616c6" into cw-f-dev
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