tag | 7c252c32731ceb33f3f5c894ddd8d3e5efd375f8 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Oct 02 11:02:55 2017 -0700 |
object | bb07eb517550e6c4793f0bf6f5d45eafb5d3f662 |
Android 7.1.1 Release 58 (N9F27M)
commit | bb07eb517550e6c4793f0bf6f5d45eafb5d3f662 | [log] [tgz] |
---|---|---|
author | Walter Jang <wjang@google.com> | Mon Nov 07 09:24:43 2016 -0800 |
committer | android-merger <android-merger@vpba3.mtv.corp.google.com> | Wed Nov 30 10:58:25 2016 -0800 |
tree | 84b40d40ec63ab96aada59819aee639a9232432c | |
parent | 1221f818b39e38f98fe4a5e3234ace8a20f6fde1 [diff] |
resolve merge conflicts of 9f523b4 to nyc-dev Bug: 32219099 Merged-In: Ib141ad682488aeabf6d90e8d169d5fff6df7a8dd Change-Id: I895b1f9f8ade2dcfa47d1c17e0aaac2edeb75a74 (cherry picked from commit b7eecdd9a1276b721bb9644a0762dfd969e52709)