OSDN Git Service

resolved conflicts for b2415086 to mnc-dr-dev-plus-aosp
authorDan Willemsen <dwillemsen@google.com>
Wed, 14 Oct 2015 04:10:09 +0000 (21:10 -0700)
committerDan Willemsen <dwillemsen@google.com>
Wed, 14 Oct 2015 04:10:09 +0000 (21:10 -0700)
commite1cd50d9854ab94f487fae63ca4f4e0717047d96
tree37760b6cfc9e50613d52308bd9bf1eccd39ef8e0
parent6613ae1c8411fb3214a08e8e142a27f140d8734c
parentb2415086f6b77db4d565de7db6206ce5cd1b9805
resolved conflicts for b2415086 to mnc-dr-dev-plus-aosp

Change-Id: I99200c7efa00c52ab0e85b362c07fa3e919d44fd