tag | 79a39b4cc576ca94dcc99a5d3741e3dfc10a2dc5 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 16:29:08 2017 -0700 |
object | f7bf74646ce0f2562306be49e8d7ba79d791b61d |
Android 7.0.0 Release 32 (NBD92F)
commit | f7bf74646ce0f2562306be49e8d7ba79d791b61d | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Mon Feb 13 14:19:40 2017 -0800 |
committer | The Android Automerger <android-build@android.com> | Tue Feb 21 16:27:42 2017 -0800 |
tree | a3b04b50b4c41a2e7df1af7f1f27af1662890e08 | |
parent | 574582e63bf28bd6f346135cff67c3a6fc3385bd [diff] |
resolve merge conflicts of 79cf158c51 to mnc-dev Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643 (cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)