tree 22fada0acb8612b5c3baca61b59386c29cdf5ed4
parent 9405f58df99855d4e715eb0e87003d132262ce09
parent 9a6b72833766f8d6372929e393fd8d392b81c49d
author Stephen Hines <srhines@google.com> 1438291398 -0700
committer Stephen Hines <srhines@google.com> 1438291398 -0700

resolved conflicts for merge of 9a6b7283 to mnc-dr-dev-plus-aosp

Change-Id: I99da925480cb05a5afc5aa0621cbe1928aa3b1f2