tag | 5b031db2a854b687d151bae0054ebeb92bc0b342 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 02 15:21:05 2017 -0800 |
object | def17aa653c6f4f42161c0f641767fbb80573e83 |
Android 7.1.1 Release 16 (NUF26K)
commit | def17aa653c6f4f42161c0f641767fbb80573e83 | [log] [tgz] |
---|---|---|
author | Tom Taylor <tomtaylor@google.com> | Tue Dec 06 16:26:14 2016 -0800 |
committer | android-merger <android-merger@vpba3.mtv.corp.google.com> | Mon Dec 19 16:22:43 2016 -0800 |
tree | 7691c59f08159384908a2e20ff99a2fe8b31499b | |
parent | 7d7ce60188006a47bcd00327fcb1684f5d3249c1 [diff] |
resolve merge conflicts of eafd58a to nyc-dev Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962