tree 764ce0e064d7d786ab93072493299999bc307386
parent c41e3191654d1b1e9df641da6aa7a8bf4f64b975
parent c1244a2995087c930842b7d5e5a35a446c5c40f7
author Adrian Roos <roosa@google.com> 1437591650 -0700
committer Adrian Roos <roosa@google.com> 1437591656 -0700

resolved conflicts for merge of c1244a29 to mnc-dr-dev

Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139