OSDN Git Service

android-x86/system-bt.git
6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2...
Android Build Merger (Role) [Sat, 26 May 2018 07:30:26 +0000 (07:30 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11 am: ed1ba213f3 am: 272ded19ed am: aebdc76523 am: 98b95ec8b4 am: ce3eb99f64 skipped: 89580929ab

Change-Id: Ic8f13917ab7a7682aa352076d12f09ec575170ea

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2...
Android Build Merger (Role) [Sat, 26 May 2018 07:29:23 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11 am: ed1ba213f3 am: 272ded19ed am: aebdc76523 am: 98b95ec8b4 am: ce3eb99f64

Change-Id: I94a5085e6d4a16759253179d34194ad17885aabb

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2...
Android Build Merger (Role) [Sat, 26 May 2018 07:29:21 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11 am: ed1ba213f3 am: 272ded19ed am: aebdc76523 am: 98b95ec8b4

Change-Id: I9dc6a8173995d2337c9e59ae6dbfc201143245e9

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2...
Android Build Merger (Role) [Sat, 26 May 2018 07:29:20 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11 am: ed1ba213f3 am: 272ded19ed am: aebdc76523

Change-Id: Ie2a4ba49599805c63b4d3ad81d2b6b50e53c385f

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2...
Android Build Merger (Role) [Sat, 26 May 2018 07:29:18 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11 am: ed1ba213f3 am: 272ded19ed

Change-Id: If0a5e66c97c1acb07555cd20c0a4bbed62e40a9a

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2...
Android Build Merger (Role) [Sat, 26 May 2018 07:29:16 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11 am: ed1ba213f3

Change-Id: I5a24b2d428c69771380e3d6484f9770a3c8cf33e

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2...
Android Build Merger (Role) [Sat, 26 May 2018 07:29:15 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2 am: bdcc61da11

Change-Id: I43e8c151fffa381413347fa2429b4a996f432199

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2
Android Build Merger (Role) [Sat, 26 May 2018 07:29:14 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055 am: 1e8cabdae2

Change-Id: I3edb3cd03b07aa7dba92f6d90026dd1c1e8d3b6b

6 years ago[automerger] GATT: Handle too short Error Response PDU am: 03881d1055
Android Build Merger (Role) [Sat, 26 May 2018 07:29:12 +0000 (07:29 +0000)]
[automerger] GATT: Handle too short Error Response PDU am: 03881d1055

Change-Id: I1d7cb68481b798a0f59b8b8bdf6639f5fb1c5fea

6 years agoGATT: Handle too short Error Response PDU
Jakub Pawlowski [Wed, 23 May 2018 17:30:19 +0000 (10:30 -0700)]
GATT: Handle too short Error Response PDU

Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.

Bug: 79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f

6 years agoGATT: Handle too short Error Response PDU
Jakub Pawlowski [Wed, 23 May 2018 17:19:53 +0000 (10:19 -0700)]
GATT: Handle too short Error Response PDU

Since the spec is not clear what to do in this case, use one of
reserved error codes as a failure reason, and pass it to upper layers.

Bug: 79591688
Change-Id: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f
Merged-In: Ie6a53e9c8e4ceb8f1e5a75aee44baa5f4a798c4f

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:56:23 +0000 (02:56 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8 am: 0f69ef1742 am: 1e0d3bafed am: 13a24d8cc9 am: 42d53a8c71 am: 2f5acf66b0 skipped: 0488ddb980

Change-Id: Id6fbc4d73a7b922ff9224850000a4a1f10b81050

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:50:31 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8 am: 0f69ef1742 am: 1e0d3bafed am: 13a24d8cc9 am: 42d53a8c71 am: 2f5acf66b0

Change-Id: I55b0755496a55a6f1c5a84227104f6478f05d0b4

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:50:30 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8 am: 0f69ef1742 am: 1e0d3bafed am: 13a24d8cc9 am: 42d53a8c71

Change-Id: I5516d1c6ec683898b459bf9ba9c57299404aa42f

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:50:28 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8 am: 0f69ef1742 am: 1e0d3bafed am: 13a24d8cc9

Change-Id: Id9651d76b8cd1ab201f5f3024ea8f7b2d57de521

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:50:26 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8 am: 0f69ef1742 am: 1e0d3bafed

Change-Id: If52d04ab58a88e517a559d11d4f876a2ba56d70f

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:50:25 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8 am: 0f69ef1742

Change-Id: I274a46dd9edf3810f47daf791e1dc69c6ba0504b

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:50:23 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d am: c8a02c4bd8

Change-Id: Ib296956f3e5ff59ed7f02d61dcc6bf93e572c58f

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d...
Android Build Merger (Role) [Sat, 26 May 2018 02:50:21 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d am: ab7f755c9d

Change-Id: Ib45cb979df156f9871bbe845dcd12d291681035e

6 years ago[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d
Android Build Merger (Role) [Sat, 26 May 2018 02:50:19 +0000 (02:50 +0000)]
[automerger] Add PDU size checks in process_service_search_attr_rsp am: 3181bdee7d

Change-Id: Ib457d90751151790f92abe23b38596c02f0a69af

6 years agoAdd PDU size checks in process_service_search_attr_rsp
Jakub Pawlowski [Thu, 24 May 2018 15:59:34 +0000 (08:59 -0700)]
Add PDU size checks in process_service_search_attr_rsp

Bug: 79884292
Change-Id: Icc02a6188f806f766aa8676804d74995afa08d25
Merged-In: Icc02a6188f806f766aa8676804d74995afa08d25

6 years agoAdd PDU size checks in process_service_search_attr_rsp
Jakub Pawlowski [Thu, 24 May 2018 15:59:34 +0000 (08:59 -0700)]
Add PDU size checks in process_service_search_attr_rsp

Bug: 79884292
Change-Id: Icc02a6188f806f766aa8676804d74995afa08d25
Merged-In: Icc02a6188f806f766aa8676804d74995afa08d25

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into nyc-mr2-dev
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb am: 58304c3cf3
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241
  DO NOT MERGE: Check number of attributes before writing to a buffer

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into cw-f-dev
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241
  DO NOT MERGE: Check number of attributes before writing to a buffer

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into nyc-mr1-dev
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241
  DO NOT MERGE: Check number of attributes before writing to a buffer

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into nyc-dr1-dev
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241
  DO NOT MERGE: Check number of attributes before writing to a buffer

6 years agoMerge "DO NOT MERGE: Check number of attributes before writing to a buffer" into...
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into nyc-dev

6 years agoMerge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into oc-dev
Ajay Panicker [Mon, 14 May 2018 18:27:44 +0000 (18:27 +0000)]
Merge changes from topic "am-deb20f2a-d7e9-4660-922e-16ad46b80c7a" into oc-dev

* changes:
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb am: 58304c3cf3 skipped: ec6632f93a
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb am: 58304c3cf3
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b
  [automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241
  DO NOT MERGE: Check number of attributes before writing to a buffer

6 years agoMerge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev
Ajay Panicker [Mon, 14 May 2018 18:01:38 +0000 (18:01 +0000)]
Merge "Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ" into oc-dev

6 years agoMerge "DO NOT MERGE: Check number of attributes before writing to a buffer" into...
TreeHugger Robot [Fri, 11 May 2018 22:26:01 +0000 (22:26 +0000)]
Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev

6 years agoMerge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev
TreeHugger Robot [Fri, 11 May 2018 22:24:23 +0000 (22:24 +0000)]
Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into oc-dev

6 years agoMerge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into nyc-dev
TreeHugger Robot [Fri, 11 May 2018 22:24:01 +0000 (22:24 +0000)]
Merge "DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE" into nyc-dev

6 years agoDO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Fri, 11 May 2018 19:03:07 +0000 (12:03 -0700)]
DO NOT MERGE: Check number of attributes before writing to a buffer

Bug: 73824150
Test: Compile
Change-Id: I2a28a503cd74758e707d1e591b55c278d2299f45

6 years ago[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer...
Android Build Merger (Role) [Fri, 11 May 2018 18:58:10 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb am: 58304c3cf3 skipped: ec6632f93a

Change-Id: Id43b919238d9f5bf7b9621e1a492fcab41e77282

6 years ago[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer...
Android Build Merger (Role) [Fri, 11 May 2018 18:58:09 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb am: 58304c3cf3

Change-Id: Ice70ef13544a1f93a9dafb71241141274b81a7f1

6 years ago[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer...
Android Build Merger (Role) [Fri, 11 May 2018 18:58:08 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b am: 703cd5a1eb

Change-Id: Id36e3e2c089f6302db698b844a7ed0042e5b8658

6 years ago[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer...
Android Build Merger (Role) [Fri, 11 May 2018 18:58:06 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241 am: e24f24f31b

Change-Id: I8df01c872458bbc8b4ab435855b6c76353c8dab7

6 years ago[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer...
Android Build Merger (Role) [Fri, 11 May 2018 18:58:05 +0000 (18:58 +0000)]
[automerger] DO NOT MERGE: Check number of attributes before writing to a buffer am: d28e985241

Change-Id: Ic7688754333ee91513ef0fcd47594eb9e561b3dd

6 years agoDO NOT MERGE: Check number of attributes before writing to a buffer
Ajay Panicker [Fri, 11 May 2018 18:47:31 +0000 (11:47 -0700)]
DO NOT MERGE: Check number of attributes before writing to a buffer

Bug: 73824150
Test: Compile
Change-Id: Ie38ba177d6599afe28b5c6684bd951a75fa8a805

6 years agoDO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE
Hansong Zhang [Fri, 11 May 2018 18:36:29 +0000 (11:36 -0700)]
DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE

Test: manual
Bug: 73782082
Change-Id: I4e384a2f8c0d8c4af03bd5865b2e907321419c86

6 years ago[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am...
Android Build Merger (Role) [Fri, 11 May 2018 18:41:13 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am: 9ca8320100 am: e621790539 am: 26881fbd81 am: 90f604c087 skipped: 5ab83c7a00

Change-Id: Ibcd75cd9298d3b3d03da14813514f662a141c66e

6 years ago[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am...
Android Build Merger (Role) [Fri, 11 May 2018 18:41:11 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am: 9ca8320100 am: e621790539 am: 26881fbd81 am: 90f604c087

Change-Id: I45890811e5ea93ef7b2e42380b68064831a58097

6 years ago[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am...
Android Build Merger (Role) [Fri, 11 May 2018 18:41:10 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am: 9ca8320100 am: e621790539 am: 26881fbd81

Change-Id: I3b58713fffba346fb96b93632755a41cf9f5a88e

6 years ago[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am...
Android Build Merger (Role) [Fri, 11 May 2018 18:41:08 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am: 9ca8320100 am: e621790539

Change-Id: I0f8c4399029939d01cdf9be1827e0957df8fcde6

6 years ago[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am...
Android Build Merger (Role) [Fri, 11 May 2018 18:41:06 +0000 (18:41 +0000)]
[automerger] DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE am: 9ca8320100

Change-Id: Ic53f90a5ce4767355afaeb0852053120f28df135

6 years agoDO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE
Hansong Zhang [Fri, 11 May 2018 18:40:44 +0000 (11:40 -0700)]
DO NOT MERGE AVRC: Add bound check for AVRC_EVT_APP_SETTING_CHANGE

Test: manual
Bug: 73782082
Change-Id: I4e384a2f8c0d8c4af03bd5865b2e907321419c86

6 years agoAdd bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ
Ajay Panicker [Fri, 13 Apr 2018 00:03:09 +0000 (17:03 -0700)]
Add bounds check to l2cble_process_sig_cmd L2CAP_CMD_DISC_REQ

Bug: 74121659
Test: Compiles
Change-Id: Idf58e7b25b41ae1bd43cdd51de424b18e03cc7e8

6 years agoMerge "DO NOT MERGE Prevent stack overflow in btif_storage" into oc-dev
android-build-team Robot [Fri, 4 May 2018 01:41:26 +0000 (01:41 +0000)]
Merge "DO NOT MERGE Prevent stack overflow in btif_storage" into oc-dev

6 years agoMerge "DO NOT MERGE Prevent stack overflow in btif_storage" into nyc-dev
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge "DO NOT MERGE Prevent stack overflow in btif_storage" into nyc-dev

6 years agoMerge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into nyc...
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee am: 0d93124725
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958
  DO NOT MERGE Prevent stack overflow in btif_storage

6 years agoMerge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into cw...
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into cw-f-dev

* changes:
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958
  DO NOT MERGE Prevent stack overflow in btif_storage

6 years agoMerge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into nyc...
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into nyc-mr1-dev

* changes:
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958
  DO NOT MERGE Prevent stack overflow in btif_storage

6 years agoMerge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into nyc...
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into nyc-dr1-dev

* changes:
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958
  DO NOT MERGE Prevent stack overflow in btif_storage

6 years agoMerge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into oc-dev
android-build-team Robot [Thu, 3 May 2018 23:15:36 +0000 (23:15 +0000)]
Merge changes from topic "am-75dfedd1-e9af-4127-a4f2-dca9a919845a-nyc-dev" into oc-dev

* changes:
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee am: 0d93124725 skipped: 674ed907aa
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee am: 0d93124725
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156
  [automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958
  DO NOT MERGE Prevent stack overflow in btif_storage

6 years agoDO NOT MERGE Prevent stack overflow in btif_storage
Hansong Zhang [Thu, 26 Apr 2018 22:50:53 +0000 (15:50 -0700)]
DO NOT MERGE Prevent stack overflow in btif_storage

Bug: 73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:44 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee am: 0d93124725 skipped: 674ed907aa

Change-Id: Ie007f16c325850162619837587b43dcfd4009b1f

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:42 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee am: 0d93124725

Change-Id: I881f729bd844988a39bf561b870cbdca9c6d45df

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:41 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156 am: f951aec9ee

Change-Id: Ic9ca21f1cb39213bf24b725389b5ea5b48f29864

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:40 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958 am: b26970f156

Change-Id: Ifee397028d2567d6b9e97cb42e7b72e96433fc5b

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:38 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 1d200be958

Change-Id: I22cc9734c1786d691702651f5799b74cab5678a6

6 years agoDO NOT MERGE Prevent stack overflow in btif_storage
Hansong Zhang [Thu, 26 Apr 2018 22:45:28 +0000 (15:45 -0700)]
DO NOT MERGE Prevent stack overflow in btif_storage

Bug: 73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:14 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82 skipped: 4dfb42893f am: 2503636b1e am: 27d3295db2 am: c3deead2f0 am: bbba8d8db4 skipped: e294ca0aa6

Change-Id: I97a4460e30f040e3500cdc495d2d0fe9960e46dd

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:13 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82 skipped: 4dfb42893f am: 2503636b1e am: 27d3295db2 am: c3deead2f0 am: bbba8d8db4

Change-Id: I251795a9c72e4b6bf9ac74df1ed80edd98ec9f4b

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:11 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82 skipped: 4dfb42893f am: 2503636b1e am: 27d3295db2 am: c3deead2f0

Change-Id: I93c2e0d344fede8b48d193fc9b4e0915d914122b

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:09 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82 skipped: 4dfb42893f am: 2503636b1e am: 27d3295db2

Change-Id: Ifca7d2ba13f95f44857833299227daddbed53ea6

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:07 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82 skipped: 4dfb42893f am: 2503636b1e

Change-Id: I4ae296df5e8019bfb178c1c61d8eec2cac61200b

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:05 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82 skipped: 4dfb42893f

Change-Id: Id44112648ab9ba78c64631ae2613e154a42f15a6

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:03 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af am: 6a0ef37a82

Change-Id: I718febf1f78b104c9e122a75dd9e5f94e53637a3

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am...
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:01 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea am: 525aee59af

Change-Id: Ib813cfc3cba01369c9ccada373d482544fd60c16

6 years ago[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea
Android Build Merger (Role) [Thu, 26 Apr 2018 22:47:00 +0000 (22:47 +0000)]
[automerger] DO NOT MERGE Prevent stack overflow in btif_storage am: 560a6244ea

Change-Id: I34d8e29615d621cdfadd2f452dd7fd67454929b7

6 years agoDO NOT MERGE Prevent stack overflow in btif_storage
Hansong Zhang [Thu, 26 Apr 2018 22:45:28 +0000 (15:45 -0700)]
DO NOT MERGE Prevent stack overflow in btif_storage

Bug: 73963551
Test: manual
Change-Id: I5f7a583aad150ebf9e3d492181d80ca935c8aa3f

6 years agoMerge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve...
Calin Juravle [Tue, 17 Apr 2018 00:54:05 +0000 (00:54 +0000)]
Merge "DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"" into oc-dev

6 years agoDO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"
Calin Juravle [Mon, 16 Apr 2018 23:57:34 +0000 (23:57 +0000)]
DO NOT MERGE SMP: Revert "DO NOT MERGE SMP: Validate remote elliptic curve points"

This reverts commit e11ebfc21963ae905d58c034310efeca0e7cd2ee.

Reason for revert: breaks oc-mr1 build
BUG: 72377774
Change-Id: If14987041ba6b68ca00170b53b3942725615ff8d

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:06 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf skipped: f5be85f852 am: b86ae24aef am: 8c86c0c1da am: a4755cf297 am: cbf0dca767 skipped: 775ea97ce3

Change-Id: Idd464930b9d893647b40a9b14b3ddc692802dac5

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:04 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf skipped: f5be85f852 am: b86ae24aef am: 8c86c0c1da am: a4755cf297 am: cbf0dca767

Change-Id: Ifdf9d93f1e14ee8424aac0131035d1f3a735ff0a

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:03 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf skipped: f5be85f852 am: b86ae24aef am: 8c86c0c1da am: a4755cf297

Change-Id: Ic16109cfa49ba248ef79e511e3664cd6fb2056e9

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:10:01 +0000 (20:10 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf skipped: f5be85f852 am: b86ae24aef am: 8c86c0c1da

Change-Id: Ic874ee0e6d4cb4e92effb6cc75580dc7b10acc59

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:59 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf skipped: f5be85f852 am: b86ae24aef

Change-Id: I4894c6bd85e9e602b0f1fe34fcc06aa5a1b41388

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:58 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf skipped: f5be85f852

Change-Id: I09c7fbeb8ca3814d2c91aac744ca5c91fa8e34c4

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:57 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed am: 7d660ff9bf

Change-Id: I6a6369b2bac96ef4926969b5909e85026553aff8

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:56 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8 am: 13113597ed

Change-Id: Ia7b054ec720067d2b84d8e10f768fa92eb802008

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:54 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 94dd5564d8

Change-Id: Ib7066a2e0075b02ba1d1400b559287e3eef08200

6 years agoDO NOT MERGE SMP: Validate remote elliptic curve points
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points

Fixes: 72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit 9181ec28da94705a763edbe60bd2a87e5f882beb)

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:03 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce skipped: 0c4e21ec13 am: 4c2c4dade5 am: 2c2804d3ed am: 6d8e884c75 am: 4e7049f54b skipped: f7d79a01d8

Change-Id: I07574dac78d1be4aef5a3154b2001c3cd239bad6

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:02 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce skipped: 0c4e21ec13 am: 4c2c4dade5 am: 2c2804d3ed am: 6d8e884c75 am: 4e7049f54b

Change-Id: Ie238d797d89b25c5bf2cf6e84427773f1b76285c

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:09:01 +0000 (20:09 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce skipped: 0c4e21ec13 am: 4c2c4dade5 am: 2c2804d3ed am: 6d8e884c75

Change-Id: Idc6489856bef71c96be1105a058e9ce1226f90de

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:59 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce skipped: 0c4e21ec13 am: 4c2c4dade5 am: 2c2804d3ed

Change-Id: I9cd2497707fba6486827447412b14916f59ea92d

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:58 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce skipped: 0c4e21ec13 am: 4c2c4dade5

Change-Id: Iacb795d8e741d01d8c81c95657174f2fb43142c5

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:56 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce skipped: 0c4e21ec13

Change-Id: I3d83c500f4504773a3d9160d984ef91aeaa63d36

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:55 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525 am: 96e39c15ce

Change-Id: I552dd39875722ac041979c4cce15e378cab32d5a

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:53 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 0b036a5525

Change-Id: I855b3b72659643947a5d28f01ac37dd6ab920a4f

6 years agoDO NOT MERGE SMP: Validate remote elliptic curve points
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points

Fixes: 72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit 9181ec28da94705a763edbe60bd2a87e5f882beb)

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:03 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb am: 399a1b955b am: 9be00e438f am: 6c342395e7 skipped: ad8199c153

Change-Id: If9b1cbddc778b067b12524d1785b917ae0768190

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:02 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb am: 399a1b955b am: 9be00e438f am: 6c342395e7

Change-Id: Ia2a1ae3af0bdf5c0ddd8c75be724307fa190c951

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:08:00 +0000 (20:08 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb am: 399a1b955b am: 9be00e438f

Change-Id: I9f969320602f60bd2e33f8ec945ef6d08a6d654c

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb...
Android Build Merger (Role) [Mon, 16 Apr 2018 20:07:58 +0000 (20:07 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb am: 399a1b955b

Change-Id: I7f9c21ae2b9fd334c66e3f7975289a206f8082e7

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb
Android Build Merger (Role) [Mon, 16 Apr 2018 20:07:56 +0000 (20:07 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: 1a9023fffb

Change-Id: I296f52fdb61084a34b5b9212f119570a073d5fab

6 years agoDO NOT MERGE SMP: Validate remote elliptic curve points
Andre Eisenbach [Wed, 4 Apr 2018 20:38:38 +0000 (13:38 -0700)]
DO NOT MERGE SMP: Validate remote elliptic curve points

Fixes: 72377774
Test: net_test_stack_smp (where applicable)
Change-Id: Iefcf97364493467075fadefd77d12716f71cd4f6
(cherry picked from commit 9181ec28da94705a763edbe60bd2a87e5f882beb)

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: accdcd94ab...
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:33 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: accdcd94ab am: b0f36356d8 skipped: 65bedc6768

Change-Id: If98fd8b677ee7038d8dda5f78cfc56371ba4f400

6 years ago[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: accdcd94ab...
Android Build Merger (Role) [Mon, 16 Apr 2018 16:50:30 +0000 (16:50 +0000)]
[automerger] DO NOT MERGE SMP: Validate remote elliptic curve points am: accdcd94ab am: b0f36356d8

Change-Id: I8e07c755fa727dbf746395be50271eac5c57a79c