| tag | a2c2ffebaed538c0cfbf1c5b02b4753c0e3b674e | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 02 13:21:09 2019 -0800 |
| object | c5fa04058c0eb904abf30d7473f5b6d302a84758 |
Android mainline 10.0.0 release 4
| commit | c5fa04058c0eb904abf30d7473f5b6d302a84758 | [log] [tgz] |
|---|---|---|
| author | Hall Liu <hallliu@google.com> | Wed Sep 18 17:33:52 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 18 17:33:52 2019 -0700 |
| tree | 38d0975f45ddd8eb45b59cc6b92a620f03431887 | |
| parent | 61833e108ed46b4792eade015501128da9edc4cc [diff] | |
| parent | 9a7677046f0bf157616d77cc085621a0d50dcb98 [diff] |
[automerger skipped] resolve merge conflicts of 72b6ac9075afff486072049416d38b44c046c9f2 to pi-dev am: 02e896c5f8 -s ours am: 54d8b881e6 -s ours am: 9a7677046f -s ours am skip reason: change_id I59b297642d2000dde0a83f77b20112c7382b7ef1 with SHA1 30a633ac17 is in history Change-Id: Ib64d561f663974868d74e5179d2c81eb22f18c46