tag | d6602bddfc2ab34c2b25703c5e7440f5b09fb373 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 16:29:05 2017 -0700 |
object | 7538d1ca28833b4aab4bfbb581e59823b521db42 |
Android 7.0.0 Release 32 (NBD92F)
commit | 7538d1ca28833b4aab4bfbb581e59823b521db42 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Tue Feb 14 13:49:07 2017 -0800 |
committer | The Android Automerger <android-build@android.com> | Tue Feb 21 16:25:41 2017 -0800 |
tree | c150f29dbcafbb42be4c16082051fa0457ee1896 | |
parent | 75d012bed490d235384914a7045dbd3d547dcefd [diff] |
resolve merge conflicts of 3654ad0 to mnc-dr-dev Bug: 33818508 Bug: 34013472 Change-Id: I2e99cbceba1c00555d624e8975522725e362362b (cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)