tag | 61357554cf491774e7ddfb583bb75d3655c13584 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 02 14:50:59 2017 -0800 |
object | 1da8691de385c139226e1f6846cb5ea59e781633 |
Android 7.1.1 Release 15 (N4F26Q)
commit | 1da8691de385c139226e1f6846cb5ea59e781633 | [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> | Wed Dec 14 17:00:08 2016 -0800 |
tree | 7691c59f08159384908a2e20ff99a2fe8b31499b | |
parent | d599d42b27cb0368e4f982189c7fc928e6387e8c [diff] |
resolve merge conflicts of eafd58a to nyc-dev Change-Id: I58151ca0c248dd4b84c78c8e7ca73d5a80bbd962 (cherry picked from commit a43c5c5f18d966355a63db194c931e02267a2695)