commit | c89dd2d822ef2b872592c0ec87f57007a133bbbb | [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 17:20:53 2017 -0800 |
tree | c150f29dbcafbb42be4c16082051fa0457ee1896 | |
parent | 043127d3f4ce772afff37c3129520012c814eb01 [diff] |
resolve merge conflicts of 3654ad0 to mnc-dr-dev Bug: 33818508 Bug: 34013472 Change-Id: I2e99cbceba1c00555d624e8975522725e362362b (cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)