tag | fb42a095dc3a1f001e42790724deac281f9a1de9 | |
---|---|---|
tagger | The Android Open Source Project <initial-contribution@android.com> | Mon Apr 03 09:24:49 2017 -0700 |
object | ebfae1e0eeb80dc14aab4bb233f0dbd1b982a6dc |
Android 7.1.1 Release 33 (N4F26X)
commit | ebfae1e0eeb80dc14aab4bb233f0dbd1b982a6dc | [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> | Wed Feb 22 15:14:51 2017 -0800 |
tree | c7514eb9f311a6794b5f143549f4f30d4cfc0946 | |
parent | 70377a7a2c98949eb46d3bc50885c89247c8dca5 [diff] |
resolve merge conflicts of 3654ad0 to mnc-dr-dev Bug: 33818508 Bug: 34013472 Change-Id: I2e99cbceba1c00555d624e8975522725e362362b (cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)