tree f0905f1a1cc7807438105f017ff63545bcfe7e69
parent 84fd44abe68148ab83a6dc76a80335015264fd5d
parent 9b82dc749dc3bcb5c9fb57ec35d8030ae7098192
author Paul Jensen <pauljensen@google.com> 1438185188 -0400
committer Paul Jensen <pauljensen@google.com> 1438185188 -0400

resolved conflicts for merge of 9b82dc74 to mnc-dr-dev

Change-Id: I67c8ba7dc94e17eb34fd315c969f02889a1596cc