tree 02f236c0854b792015c9e0deea628b11af47e275
parent 43b1f823b5a739437cbe14e24d8449028e3c8f6e
parent 216bff9ff33d74fb7f232045799a93b102a4d2a2
author Andreas Gampe <agampe@google.com> 1445577326 -0700
committer Andreas Gampe <agampe@google.com> 1445577326 -0700

resolve merge conflicts of 216bff9ff3 to mnc-dr-dev.

Change-Id: I63c4f3a4e56f30d6f476ad2c623c23ee7e1a3778