| tag | ea8094ba77a0328f6d7fae6d2262cf14e8210fe4 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 17:36:31 2017 -0700 |
| object | b39ad062d1ad6e0ec01379584a5347c19693365f |
Android 7.1.1 Release 38 (N6F26Y)
| commit | b39ad062d1ad6e0ec01379584a5347c19693365f | [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> | Mon Feb 27 12:41:43 2017 -0800 |
| tree | 9ae60ef22bb12effb52a97aafc64b414d0a066ef | |
| parent | 2395604646cb0def40eeaa6046c5d39974147d93 [diff] |
resolve merge conflicts of 79cf158c51 to mnc-dev Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643 (cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)