tag | 045fbba6a50f13e6aeee660ecf06810b10164089 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 09:54:38 2017 -0700 |
object | 5930dc437973210277fe4175506c3636be75fb74 |
Android 7.1.1 Release 35 (NOF27D)
commit | 5930dc437973210277fe4175506c3636be75fb74 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Mon Feb 13 14:19:40 2017 -0800 |
committer | android-merger <android-merger@vpba3.mtv.corp.google.com> | Wed Feb 22 14:43:51 2017 -0800 |
tree | 9ae60ef22bb12effb52a97aafc64b414d0a066ef | |
parent | c4e146b5c6478d77c73732f041b090e37b02da07 [diff] |
resolve merge conflicts of 79cf158c51 to mnc-dev Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643 (cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)