tag | 5c6b5de7e2486e50642cec457110dae477117a7c | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 09:24:52 2017 -0700 |
object | 70debbc26de468f9a02af23db6c7bcb64eb90c6b |
Android 7.1.1 Release 33 (N4F26X)
commit | 70debbc26de468f9a02af23db6c7bcb64eb90c6b | [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 15:17:03 2017 -0800 |
tree | 9ae60ef22bb12effb52a97aafc64b414d0a066ef | |
parent | 2f78c7010af1c7527fe08f2fbcc04b0c1c28a33f [diff] |
resolve merge conflicts of 79cf158c51 to mnc-dev Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643 (cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)