commit | 7d65c7b7ebbb04dd39a6cb21cc3fec3ec480422c | [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 14:41:53 2017 -0800 |
tree | c7514eb9f311a6794b5f143549f4f30d4cfc0946 | |
parent | 82e1bdb57b8b1cb032d42553092039b42762f4d2 [diff] |
resolve merge conflicts of 3654ad0 to mnc-dr-dev Bug: 33818508 Bug: 34013472 Change-Id: I2e99cbceba1c00555d624e8975522725e362362b (cherry picked from commit 37345554fea84afd446d6d8fbb87feea5a0dde3f)