summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-18Snap for 7468789 from 783a313c1768fd21f41c08df5465815658d8247c to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid-build-team Robot
Change-Id: I9be15e124035d8c85faede8140eb3b3e39978f8d
2021-06-17Update kernel to builds 7460814 am: 2d368d43e1android12-devLucas Wei
Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/15010114 Change-Id: I79f09ba6a2c2541f7530d62fd36e32c565f4849f
2021-06-17Update kernel to builds 7460814Lucas Wei
git log --first-parent -100 --oneline --no-decorate f9b88fb75f73..6fcf87747e0e: 6fcf87747e0e Revert "perf/cgroups: Don't rotate events for cgroups unnecessarily" 5e002cfc49c0 Revert "perf/core: Fix corner case in perf_rotate_context()" 7fb3f18d8f24 Merge 4.19.194 into android-4.19-stable ea6ea821c590 Merge 4.19.193 into android-4.19-stable 485921204039 Merge 4.19.192 into android-4.19-stable 8ff7a6bc60f9 Revert "spi: Fix use-after-free with devm_spi_alloc_*" dd4d5fdb582d Revert "modules: inherit TAINT_PROPRIETARY_MODULE" 011b73c995f3 Merge 4.19.191 into android-4.19-stable Test: treehugger Bug: 189791081 Change-Id: I88e1b6b0e2a715eecf144ee514ca5542c4c48283
2021-06-17Snap for 7464903 from 4a1bcb93417ec4ed32066541d5feba783a82e3ef to sc-releaseandroid-build-team Robot
Change-Id: I5e9202851d7b29bd8cd8bbe625075d11a66d1b50
2021-06-16Update kernel to builds 7380478 am: b21b03b87d am: b132f1f5a2Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1713128 Change-Id: I0d822c206f48717b7c50d2c98009c8175adcca0a
2021-06-16Update kernel to builds 7333514 am: 463a9118ab am: c7ae8cc5ffLucas Wei
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1695306 Change-Id: Iedf7247a031cc3967fe07319c863d746a8703fd4
2021-06-16Update kernel to builds 7321179 am: 0647cb11d4 am: 4b6e92e6b8Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1690219 Change-Id: I8953c88cffcaa935b4f3b5cfcbfefe458df5ea97
2021-06-16Update kernel to builds 7185583 am: 78aede7b02 am: b1bbcb3f3dWill McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1620920 Change-Id: I828185e91956b747133dc9949a304fea2b2ef8e3
2021-06-16[automerger skipped] Mark ab/7061308 as merged in stage. am: 89506c7bae -s ↵Xin Li
ours am: 7090a60009 -s ours am skip reason: Merged-In Id44dff19540f046822163d1c1c01801c2da6f1f7 with SHA-1 4b3501de2c is already in history Original change: undetermined Change-Id: I7a43a40e398ddeabb22be885b88438ba2885a9c7
2021-06-16Update kernel to builds 7119285 am: b9cbc53d66 am: c8e7e6da54 am: 70a2326d9eWill McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1570976 Change-Id: I09b8717ded0a30d945cd5db039716792862fe010
2021-06-16Snap for 7098088 from 7b8825b06078fc2228229c4d8c9cf35ca57d7191 to sc-release ↵android-build-team Robot
am: 485b41676c am: b9fee936e8 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/13391764 Change-Id: If4ceb1be0b6bea49d2f81a43a1a98e08a5a72cda
2021-06-16Snap for 7072874 from b8f23c9f1ff0770ed6a1607d2ccdbb121180ff00 to sc-release ↵android-build-team Robot
am: 41ba89231d Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/13313004 Change-Id: Id0c8256cc0f4e292fbd0441ccd642206f6e66a68
2021-06-16Snap for 7035473 from 43fb08149f7e536254e5bea8d866686b3a9191f3 to sc-release ↵android-build-team Robot
am: ccaf6e4c7e Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/13232783 Change-Id: I5c566adc96db3c4378c410a9453f63896af5237d
2021-06-16Snap for 7028657 from d7c78664fda45c73bb28726784f25305180c8c17 to sc-release ↵android-build-team Robot
am: e7bdc22f65 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/13211972 Change-Id: I0b000f3b2853147667f01f65926e20b33a328157
2021-06-16Snap for 6993684 from 38116fbc28e37f2346688e7696332c148d929de9 to sc-release ↵android-build-team Robot
am: 366b570432 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/13122489 Change-Id: I55cec3d34d4cba29d40b0e7bd278dec90c002499
2021-06-16Snap for 6943286 from 41645de3f1dd927ee9bfb5f98bc6c8201b4c5b4e to sc-release ↵android-build-team Robot
am: 6e579b9bc8 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12960590 Change-Id: I3666753a35bd2b6fe3b37fb3f186a0e12899f45a
2021-06-16Snap for 6896080 from 823e0f222ed0c086754fa7dc00284a651c16a5d4 to sc-release ↵android-build-team Robot
am: d89f8ebd3a Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12806588 Change-Id: Ia3ebb1931dac8484b558857d510bb8d7dc7b08b0
2021-06-16Snap for 6893275 from c68152d6ea4c0e14c13a08aa5c21a3e711133149 to sc-release ↵android-build-team Robot
am: a750e228ca Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12797144 Change-Id: I84d371f2143dcc51bca21873b1bfd26194480a4d
2021-06-16Snap for 6832148 from 8722f344d95ff012a89b86672ee4ebf8ad62c084 to sc-release ↵android-build-team Robot
am: ffc42ab428 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12580839 Change-Id: I4c05a5f83d96492ce44e3e901c2e6ce0918f9579
2021-06-16Snap for 6809790 from badb4fa77d1a9c3223fe8f9bed8b934ba160d4f5 to sc-release ↵android-build-team Robot
am: 45d36657c5 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12515418 Change-Id: Ib4087a8f9642431d2ed3d97848ad1d075cf0cf30
2021-06-16Snap for 6643616 from 7f098075833074be33b4e5244b4a0a4085ede150 to sc-release ↵android-build-team Robot
am: 3c1242b76b Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12053376 Change-Id: I9eab49fdc26e3141a9eb82e6120582f72d05b3ae
2021-06-16Snap for 6630042 from c12c8e06993fe32588fd06ff7e0ff548dc637557 to sc-release ↵android-build-team Robot
am: 39b5f86993 Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12005795 Change-Id: Ib251a010190507493fac45e09ab6eb1e23db70e5
2021-05-25Snap for 7394644 from 7af30781221edaac7f2a0e246cd657ff391ce9c0 to sc-releaseandroid-build-team Robot
Change-Id: I519ee2fbc35a79b495587435f1c27ea82ec782be
2021-05-24Update kernel to builds 7380478 am: b21b03b87dWill McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1713128 Change-Id: I6ca3a4bdaaae4bd1e3c590845bd1365197f14e48
2021-05-24Update kernel to builds 7333514 am: 463a9118abLucas Wei
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1695306 Change-Id: I51bb0a09a3f20bea90a3ac48bbddaedfd65bc807
2021-05-24Update kernel to builds 7321179 am: 0647cb11d4Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1690219 Change-Id: Ia83c3886f89588ff8d3b51bb35bd2780c162bd98
2021-05-24Update kernel to builds 7185583 am: 78aede7b02Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1620920 Change-Id: I6652d25cc3e5d689f43a0c3d8d8e2e0ad13b58d5
2021-05-24[automerger skipped] Mark ab/7061308 as merged in stage. am: 89506c7bae -s oursXin Li
am skip reason: Merged-In Id44dff19540f046822163d1c1c01801c2da6f1f7 with SHA-1 4b3501de2c is already in history Original change: undetermined Change-Id: If0df3c13cd5ff559a2ec1f9124483f136b2deffb
2021-05-24Update kernel to builds 7119285 am: b9cbc53d66 am: c8e7e6da54Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1570976 Change-Id: I122a237020c8c7f9284186f63964c37055aa0b74
2021-05-24Update kernel to builds 7380478 am: b21b03b87dWill McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1713128 Change-Id: I2d99e01a04dad5222394cd352511cdb92269000c
2021-05-19Update kernel to builds 7380478Will McVicker
git log --first-parent -100 --oneline --no-decorate 1c25cf621d15..f9b88fb75f73: f9b88fb75f734 BACKPORT: arm64: vdso32: drop -no-integrated-as flag 86a623814b0a5 ANDROID: GKI: update allowed list for incrementalfs.ko cbf0a404e636b ANDROID: dm-user: Drop additional reference c83a7134e3e81 ANDROID: FUSE OWNERS pointing to android-mainline OWNERS a2c5a95d599c9 UPSTREAM: sched: Fix out-of-bound access in uclamp 8ce2f3d6f2dd0 Merge 4.19.190 into android-4.19-stable 61410d7175438 BACKPORT: FROMGIT: virt_wifi: Return micros for BSS TSF values Test: treehugger Bug: 187829246 Bug: 186611026 Change-Id: I45add379cc6f4959f649cb13d81ac2094dff9ca7
2021-05-19Update kernel to builds 7380478Will McVicker
git log --first-parent -100 --oneline --no-decorate 1c25cf621d15..f9b88fb75f73: f9b88fb75f734 BACKPORT: arm64: vdso32: drop -no-integrated-as flag 86a623814b0a5 ANDROID: GKI: update allowed list for incrementalfs.ko cbf0a404e636b ANDROID: dm-user: Drop additional reference c83a7134e3e81 ANDROID: FUSE OWNERS pointing to android-mainline OWNERS a2c5a95d599c9 UPSTREAM: sched: Fix out-of-bound access in uclamp 8ce2f3d6f2dd0 Merge 4.19.190 into android-4.19-stable 61410d7175438 BACKPORT: FROMGIT: virt_wifi: Return micros for BSS TSF values Test: treehugger Bug: 187829246 Bug: 186611026 Change-Id: I45add379cc6f4959f649cb13d81ac2094dff9ca7
2021-05-05Snap for 7336869 from 620d457434133f15b6a2fc5712e85e07ccfd060e to sc-releaseandroid-build-team Robot
Change-Id: I2d78fb1b02a7a4d06c7a5dd2efb3c89bd0ff2308
2021-05-04Update kernel to builds 7333514 am: 463a9118ab am: d836cf4490 am: facd729acdLucas Wei
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1695306 Change-Id: I945c833b672b6fe292955b99f3e47bf6b4bfa100
2021-05-04Update kernel to builds 7333514 am: 463a9118ab am: d836cf4490Lucas Wei
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1695306 Change-Id: I878700302c39821746ab1e1d340cc7ba08e316fc
2021-05-04Update kernel to builds 7333514 am: 463a9118abLucas Wei
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1695306 Change-Id: If401f57af236e11885c120c405767479e8349432
2021-05-04Update kernel to builds 7333514android-s-beta-2android-s-beta-1Lucas Wei
git log --first-parent -100 --oneline --no-decorate 67f548809de5..1c25cf621d15: 1c25cf621d15 ANDROID: Add allowed symbols requried from Qualcomm drivers 3092012197aa ANDROID: GKI: QoS: Prevent usage of dev_pm_qos_request as pm_qos_request 3881a45951c0 Merge 4.19.189 into android-4.19-stable Test: treehugger Bug: 185091725 Change-Id: I290620fb132ff6e983e4720db123d2fe2cf36d8d
2021-04-30Snap for 7325276 from 10efcb53b810a16fee1d0b920c4f1c6f307875a0 to sc-releaseandroid-build-team Robot
Change-Id: I17763d1cff9ef701cbfecea7d7591e58614cf623
2021-04-29Update kernel to builds 7321179 am: 0647cb11d4 am: d9109bca8d am: d8cb03b4e9Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1690219 Change-Id: I2c0de1e505bc832308193905ee8d9ad0266880ba
2021-04-29Update kernel to builds 7321179 am: 0647cb11d4 am: d9109bca8dWill McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1690219 Change-Id: Ib23711ed06093ed4eb72478fcf047d37204f7c36
2021-04-29Update kernel to builds 7321179 am: 0647cb11d4Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1690219 Change-Id: Idc24353560e8c4c6463559639c0536fcc2e30e81
2021-04-28Update kernel to builds 7321179Will McVicker
git log --first-parent -100 --oneline --no-decorate 5625445e6e84..67f548809de5: 67f548809de5b ANDROID: GKI: update allowed list for incrementalfs.ko b044ba80bce51 ANDROID: fs-verity: Export function to check signatures e5ce8c1798a59 UPSTREAM: fs-verity: move structs needed for file signing to UAPI header 2602760ce4007 UPSTREAM: fs-verity: rename "file measurement" to "file digest" e60c1484e317d UPSTREAM: fs-verity: rename fsverity_signed_digest to fsverity_formatted_digest 41018a55f5cbd UPSTREAM: fs-verity: remove filenames from file comments 3f37ba9fc1120 ANDROID: clang: update to 12.0.5 6b79701b0a11e Merge 4.19.188 into android-4.19-stable fcab486168adc Revert "net: xfrm: Localize sequence counter per network namespace" e0524263c870f Merge 4.19.187 into android-4.19-stable d3b8915e6f100 ANDROID: Incremental fs: Set credentials before reading/writing a1403b314f34c Merge 4.19.186 into android-4.19-stable 8c62f42548fab Merge 4.19.185 into android-4.19-stable 4a20e9c32bd5d Revert "can: dev: Move device back to init netns on owning netns delete" f411297402298 Merge 4.19.184 into android-4.19-stable 9790f49ad80eb ANDROID: Add OWNERS files referring to the respective android-mainline OWNERS 5ba052a725da6 BACKPORT: drm/virtio: Use vmalloc for command buffer allocations. 7c9d656e58345 UPSTREAM: drm/virtio: Rewrite virtio_gpu_queue_ctrl_buffer using fenced version. ec2be24ab757a ANDROID: Make vsock virtio packet buff size configurable 2758bb8ad15e1 ANDROID: fix up ext4 build from 4.19.183 72af4b8433048 Merge 4.19.183 into android-4.19-stable c1cb48892153c ANDROID: refresh ABI XML to new version 7863d393d8fe1 ANDROID: refresh ABI XML 5a9fe3e7b9e06 ANDROID: clang: update to 12.0.4 e6f7fdd39a63d Merge 4.19.182 into android-4.19-stable 39f48fe49d40f Revert "net: Introduce parse_protocol header_ops callback" 748b062052902 Revert "net: check if protocol extracted by virtio_net_hdr_set_proto is correct" 04fd6558af189 Merge 4.19.181 into android-4.19-stable 88046a76ab973 FROMGIT: configfs: fix a use-after-free in __configfs_open_file 51a2b0f841039 ANDROID: GKI: Enable CONFIG_BT for x86 1a296ebd2bfcf Revert "Revert "zram: close udev startup race condition as default groups"" 022059b0c5a25 Revert "block: genhd: add 'groups' argument to device_add_disk" 468b80238b38e Revert "nvme: register ns_id attributes as default sysfs groups" 512a245be4c4d Revert "aoe: register default groups with device_add_disk()" fc033a9dc4a8f Revert "zram: register default groups with device_add_disk()" 35c0b08665d04 Revert "virtio-blk: modernize sysfs attribute creation" 338046dc91f8f Merge 4.19.180 into android-4.19-stable e827d00a709d7 ANDROID: GKI: hack up fs/sysfs/file.c to prevent GENKSYMS change 6164fcac062b5 Revert "arm64: Avoid redundant type conversions in xchg() and cmpxchg()" 4266b7dc92b8b Merge 4.19.179 into android-4.19-stable df7c201e4f78a ANDROID: clang: update to 12.0.3 6fbaea28a7579 Revert "block: split .sysfs_lock into two locks" b0a6dfc3a2742 Revert "block: fix race between switching elevator and removing queues" c44751f1ba0d7 Revert "block: don't release queue's sysfs lock during switching elevator" bd792f5690abd Revert "dm: fix deadlock when swapping to encrypted device" 6455a150fae41 Merge 4.19.178 into android-4.19-stable Test: treehugger Bug: 186190934 Change-Id: I84afb9a24fdc5c4476cedc1e875a99f9a9eeb816
2021-03-06Snap for 7188367 from c61a02bafffbe2da800be62be9da560ba6fb7fc7 to sc-releaseandroid-build-team Robot
Change-Id: I3d471ef28619de12bb242f4ea696833eff0d452c
2021-03-05Update kernel to builds 7185583 am: 78aede7b02 am: 40a1ca7c91 am: 5d1dd84bc6Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1620920 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia89620d1e41f3872ec78b0594d573390b2f393b5
2021-03-05Update kernel to builds 7185583 am: 78aede7b02 am: 40a1ca7c91Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1620920 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e4f9aa670f12ab29ab37df7c5bcdfb8c4655839
2021-03-05Update kernel to builds 7185583 am: 78aede7b02Will McVicker
Original change: https://android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/1620920 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib0234fe801bd3b97d30bf50b0d01a7142507a7be
2021-03-05Update kernel to builds 7185583Will McVicker
git log --first-parent -100 --oneline --no-decorate a3eba2009a7d..5625445e6e84: 5625445e6e845 ANDROID: syscalls/x86: use a weak function for IA32 compat syscalls 9f2be51d5cc0f ANDROID: Adding kprobes build configs for Cuttlefish e90dc48804e35 UPSTREAM: locking/static_key: Fix false positive warnings on concurrent dec/inc 549a2d6034b5d UPSTREAM: jump_label/lockdep: Assert we hold the hotplug lock for _cpuslocked() operations bda7587ce515b ANDROID: Add symbol of _proc_mkdir bce09d96d6d3d Merge 4.19.177 into android-4.19-stable 84eea1d7e8884 ANDROID: build_config: drop CONFIG_KASAN_PANIC_ON_WARN 98d8ec1f7122e Merge 4.19.176 into android-4.19-stable 4812ec50935df BACKPORT: bpf: add bpf_ktime_get_boot_ns() 19d4991aa6c9f Merge 4.19.175 into android-4.19-stable 06931a5d14e2c UPSTREAM: dma-buf: Fix SET_NAME ioctl uapi bcfb2bf23f2d3 ANDROID: GKI: Update ABI for coresight-clk-amba-dummy.ko. 699a3fa25b730 Merge 4.19.174 into android-4.19-stable ba65a97a3b7a1 Merge 4.19.173 into android-4.19-stable 6b80031fa1700 Revert "Revert "ANDROID: enable LLVM_IAS=1 for clang's integrated assembler for x86_64"" Test: treehugger Bug: 181916078 Change-Id: I188a1b5a95bb8278e80f4dc0523d253b7bda6563
2021-02-21Snap for 7160059 from f786ffc39159e7d8eae0b439e2cc07e189ae3b2b to sc-releaseandroid-build-team Robot
Change-Id: I7400c904889b6e8eb74890549f234c6ec4b2bd1e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 89506c7bae -s ↵Xin Li
ours am: fc645b5a9f -s ours am skip reason: Change-Id Id44dff19540f046822163d1c1c01801c2da6f1f7 with SHA-1 4b3501de2c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4a1076d0a75da671b0e0cb0b4c107cb80bad1016
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 89506c7bae -s oursXin Li
am skip reason: Change-Id Id44dff19540f046822163d1c1c01801c2da6f1f7 with SHA-1 4b3501de2c is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I878ab1fe10ab59663000dd93437456415a2e126a