| commit | 8d4f5079143ebf976ecf8710313143cdafca11c2 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 30 11:50:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 30 11:50:36 2020 +0000 |
| tree | b0bddf9ad0a5330f6675632a6e5429a59bf16377 | |
| parent | e6c66dc42caefe7eaefbb390bee4963b3ef94667 [diff] | |
| parent | c1a02678ca70e219665d736e4a15dab733fb4b58 [diff] |
[automerger skipped] Merge "Don't inherit userspace_reboot.mk from mainline_system.mk" am: c3d679bb88 am: 46fe30f89c am: c1a02678ca -s ours am skip reason: Change-Id If910e2a6baf8acaafc8bafdf8193ba7237f66f1a with SHA-1 0f38beca94 is in history Change-Id: Idbc16082b7321bb8231baefd8147ac4e61763efe