tag | 5677be0ab04ada402b8a43a4f3a05b47d13b46c5 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 17:36:29 2017 -0700 |
object | 33c58f0bafb361a4653125290b2974257265f042 |
Android 7.1.1 Release 38 (N6F26Y)
commit | 33c58f0bafb361a4653125290b2974257265f042 | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Tue Feb 14 13:49:07 2017 -0800 |
committer | android-merger <android-merger@vpba3.mtv.corp.google.com> | Mon Feb 27 12:39:02 2017 -0800 |
tree | c7514eb9f311a6794b5f143549f4f30d4cfc0946 | |
parent | e3c28fd5c86145e8da4c0fa31a303f71b817272e [diff] |
resolve merge conflicts of 3654ad0 to mnc-dr-dev Bug: 33818508 Bug: 34013472 Change-Id: I2e99cbceba1c00555d624e8975522725e362362b (cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)