summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-11-18Snap for 11117647 from 2943ee06e81e541341fa334f577019b91d4456e6 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: If28d571359bba770411ef924bc59fe9c8ed9417e
2023-11-16Migrate to cargo_embargo. am: 5f3de4f5b9 am: fed34964c0 am: cc90283533Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2832460 Change-Id: I5d6718755f797a679b391fdbaa64d86e1388ca94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Migrate to cargo_embargo. am: 5f3de4f5b9 am: 4d5cfc066e am: 0d93fb1bf8Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2832460 Change-Id: I0da349d6b73e15b1cdf5ce2506cc6c7188f4cc44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Migrate to cargo_embargo. am: 5f3de4f5b9 am: fed34964c0Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2832460 Change-Id: I8a413805d6e12600f1363d1269b3fd79852cbfac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Migrate to cargo_embargo. am: 5f3de4f5b9 am: 4d5cfc066eAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2832460 Change-Id: I16cbe65fe2370b885dc30e51e05e998c808b1410 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Migrate to cargo_embargo. am: 5f3de4f5b9Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2832460 Change-Id: I4726fd7e886be67a73da6117279c810997715523 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Migrate to cargo_embargo. am: 5f3de4f5b9HEADmastermainAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2832460 Change-Id: I0ee5b74f7f064e75c4da5d196a1ab158d1eb4dff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16Migrate to cargo_embargo.Andrew Walbran
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I1bc49395e73987c778f0ed4ed3d9b888c1f65e7f
2023-03-09Merge "Make proc-macro-nested available to product and vendor am: 7ca4181c61 ↵Automerger Merge Worker
am: d34f330c06 am: 272b883bc2 am: a8b1a0d7e9 am: 227cc0314a"
2023-03-09Make proc-macro-nested available to product and vendor am: 7ca4181c61 am: ↵Matthew Maurer
d34f330c06 am: 272b883bc2 am: a8b1a0d7e9 am: 227cc0314a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2476454 Change-Id: Icf9606bfc6616c458d2c6dfc5ff0411eb3919e5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-nested available to product and vendor am: 7ca4181c61 am: ↵Matthew Maurer
d34f330c06 am: 272b883bc2 am: a8b1a0d7e9 am: 6f3875a7c6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2476454 Change-Id: I3b801e8a1af1d1a40e35ef81174e431c766e264b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-nested available to product and vendor am: 7ca4181c61 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseMatthew Maurer
d34f330c06 am: 272b883bc2 am: a8b1a0d7e9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2476454 Change-Id: I5b977d08b42e58b9d9aaa691a1ca0849959202c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-nested available to product and vendor am: 7ca4181c61 am: ↵Matthew Maurer
d34f330c06 am: 272b883bc2 am: a8b1a0d7e9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2476454 Change-Id: I03340d0570ee4b334d6c4f2a59701735dcb029af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-nested available to product and vendor am: 7ca4181c61 am: ↵android14-devMatthew Maurer
d34f330c06 am: 272b883bc2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2476454 Change-Id: I3fbfea2005f90a2e846c594a9191ed8932f042b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-nested available to product and vendor am: 7ca4181c61 am: ↵Matthew Maurer
d34f330c06 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2476454 Change-Id: Iae0d84f7c57579f67030619dae39c2456bbf74ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make proc-macro-nested available to product and vendor am: 7ca4181c61android-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2476454 Change-Id: Ib436bf13321054e1974298b6175f1da8a664ba08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make proc-macro-nested available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: I19b4189522ac5c864bc56b1b582b029d7f397388
2022-08-23[Bluetooth apex] Use new apex name am: 1cff0175af am: 53c0604190 am: ↵William Escande
832b4743d0 am: cf88620707 am: 37c00ecdec Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2192221 Change-Id: I756411f2537d2cee9fabb52a976c2a23cbf599d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23[Bluetooth apex] Use new apex name am: 1cff0175af am: 53c0604190 am: ↵main-16k-with-phonesWilliam Escande
832b4743d0 am: cf88620707 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2192221 Change-Id: I862472c637093ca37caa7447fe580caa14948deb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23[Bluetooth apex] Use new apex name am: 1cff0175af am: 53c0604190 am: 832b4743d0William Escande
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2192221 Change-Id: I882a3b74e347be11e1fb6627f1e32247059a50b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23[Bluetooth apex] Use new apex name am: 1cff0175af am: 53c0604190William Escande
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2192221 Change-Id: I747b4d079fc69d15cc49609184c86915307b4387 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23[Bluetooth apex] Use new apex name am: 1cff0175afWilliam Escande
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2192221 Change-Id: Ie89691624accbe9f192fb6d9952b80a47753ccf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-22[Bluetooth apex] Use new apex namemain-16kWilliam Escande
The Bluetooth apex name is now called com.android.btservices Bug: 243054261 Test: Build Change-Id: If9b9e2561b910fb44d0028a22afc93871c93e13d
2022-03-16Merge "Update TEST_MAPPING" am: 30ec617993 am: 38cb78bd76 am: f33448a003 am: ↵Treehugger Robot
76fcb4dda6 am: 2221653494 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2005014 Change-Id: Ie70ea371f9afbf9c7596a43be14d7b3cc6b97dba
2022-03-16Merge "Update TEST_MAPPING" am: 30ec617993 am: 38cb78bd76 am: f33448a003 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_ase_331311020aml_ase_331112000aml_ase_331011020android13-mainline-tzdata4-releaseandroid13-mainline-appsearch-releaseaml_tz4_332714010Treehugger Robot
76fcb4dda6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2005014 Change-Id: Ic815afcfb24b7f0583931773cad7638cdec297cf
2022-03-16Merge "Update TEST_MAPPING" am: 30ec617993 am: 38cb78bd76 am: f33448a003 am: ↵Treehugger Robot
76fcb4dda6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2005014 Change-Id: Ief6c15b4c83ad2a2388ba133207df9852d74e470
2022-03-16Merge "Update TEST_MAPPING" am: 30ec617993 am: 38cb78bd76 am: f33448a003t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2005014 Change-Id: I2f2c29bb6e8e35253e3c65393547d799fa3450dc
2022-03-16Merge "Update TEST_MAPPING" am: 30ec617993 am: 38cb78bd76Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2005014 Change-Id: I7fe26734a1b75e0641945d95f10381b6a3fa6b2d
2022-03-15Merge "Update TEST_MAPPING" am: 30ec617993Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/2005014 Change-Id: Ib46d3d8d07db92d166858d33d89adc381f808d94
2022-03-15Merge "Update TEST_MAPPING"Treehugger Robot
2022-03-08Update TEST_MAPPINGDavid LeGare
Test: cd external/rust/crates && atest --host -c Change-Id: Ic6ed138ece7e04ce01c43ccda9b02b86c9dc110f
2021-12-22Adding bluetooth apex am: 2f23411aac am: 5b80a8f17e am: 36f1eddc1b am: ↵Roopa Sattiraju
e48cf7ce25 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1931347 Change-Id: Ic3f2d8cda841eed9b0aa0c2af9b2f943275f789d
2021-12-22Adding bluetooth apex am: 2f23411aac am: 5b80a8f17e am: 36f1eddc1bRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1931347 Change-Id: Icb9828e503378ff33839c5e0a2f497e5892a0cea
2021-12-22Adding bluetooth apex am: 2f23411aac am: 5b80a8f17eRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1931347 Change-Id: Ic92ef7aa3904d878b112301aec974db4b5cc8267
2021-12-22Adding bluetooth apex am: 2f23411aacRoopa Sattiraju
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1931347 Change-Id: Id04c54963a99ed16875ebfb8d1beb75f09a11deb
2021-12-21Adding bluetooth apexandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Roopa Sattiraju
Bug: 206121418 Test: Compile Change-Id: I2a8103923e9183e78c915f23341d2f2cc0aa54d8
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9bfcc5283c ↵Joel Galenson
am: 90a2fd905d am: 9d582077fa am: 2319e8832f Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1912682 Change-Id: I7975a28434c44cf46b7adea4a05870a4332868c5
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9bfcc5283c ↵Joel Galenson
am: 90a2fd905d am: 9d582077fa Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1912682 Change-Id: I6625d8196aa9503e1fd244320c9123304554db3a
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9bfcc5283c ↵Joel Galenson
am: 90a2fd905d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1912682 Change-Id: I8fe47dca9a1c60f92ec46d02dc1d21412bbaeba2
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9bfcc5283cJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1912682 Change-Id: I9f70bf55ec44d916184fbeb48c3aa74fca5ad43b
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: Ibb63631a0c9d15f6db0f5d3f0756a53ee591ae7b
2021-08-24Update TEST_MAPPING am: 527b56e6aa am: 8d8d8cc839 am: a3c5542818 am: ↵Joel Galenson
cfcc28f6fe am: 8bac54ce9e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1806182 Change-Id: I03e6489f83208d4471098dbcc7d4286ec4e61e77
2021-08-24Update TEST_MAPPING am: 527b56e6aa am: 8d8d8cc839 am: a3c5542818 am: cfcc28f6feJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1806182 Change-Id: I762547ce4d909d385709f470279b81abd6501f08
2021-08-24Update TEST_MAPPING am: 527b56e6aa am: 8d8d8cc839 am: a3c5542818Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1806182 Change-Id: I0f0c216dec36740a11ef48f64f1a3e78ce36764d
2021-08-24Update TEST_MAPPING am: 527b56e6aa am: 8d8d8cc839Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1806182 Change-Id: If5d51cde8749e4f23eadbf83038fb24db504fe28
2021-08-24Update TEST_MAPPING am: 527b56e6aaandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1806182 Change-Id: I6ee37a3f5aa5160a9ca851caac34734bbb1838bf
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I250c87782db0d3324079f2c6b174759574330e42
2021-06-24[automerger skipped] Make libproc_macro_nested available to DnsResolver am: ↵Treehugger Robot
cb7d3504eb -s ours am skip reason: Merged-In I4f89060c1959b9feff425c611d54308cc55a66aa with SHA-1 561cf37e88 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/15066900 Change-Id: I78f057358680a35d71d34c2670cc0a30bb355113
2021-06-23Make libproc_macro_nested available to DnsResolverandroid-mainline-12.0.0_r99android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r49android-mainline-12.0.0_r40android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r32android-mainline-12.0.0_r25android-mainline-12.0.0_r23android-mainline-12.0.0_r20android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r114android-mainline-12.0.0_r110android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r100aml_wif_311811030aml_tet_311811050aml_sdk_311710000aml_pco_311011000android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-captiveportallogin-releaseTreehugger Robot
Test: TH Bug 155855709 Original-Change: https://android-review.googlesource.com/1742036 Merged-In: I4f89060c1959b9feff425c611d54308cc55a66aa Change-Id: I4f89060c1959b9feff425c611d54308cc55a66aa