tag | e78442ace0489d577fdb8829835be2ecd5a106f7 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Aug 17 13:56:29 2020 -0700 |
object | 54d1fc2d574d21f788abb64b10c9a6352eba0b65 |
Android CTS 8.1 Release 20 (6676678)
commit | 54d1fc2d574d21f788abb64b10c9a6352eba0b65 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri May 13 22:00:17 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 13 22:00:17 2016 +0000 |
tree | 0fa8d9e7874bedc3d5b0240c332afb1e34ec766f | |
parent | ca69393b8f54e0cd38d876547a0d82e641951798 [diff] | |
parent | df64c96f01b3dd2a823d6aa788653c3bedd1efda [diff] |
resolve merge conflicts of 1cff673 to nyc-dev-plus-aosp am: b74b4ad38f am: df64c96f01 * commit 'df64c96f01b3dd2a823d6aa788653c3bedd1efda': Make dhcpcd-6.8.2 admit that it uses BSD extensions. Change-Id: Ibcc09804d01f0105a14ad07615e39d8007b5d5cf