tree 58644df7fc0a520f00078b689646a422a73511a1
parent 7239b9294914c792a95d364cfc977d08ec739db1
parent 9df68a13640f7abddf1b87b0cd4f9e6e9055b8a4
author Kenny Root <kroot@google.com> 1431534954 -0700
committer Kenny Root <kroot@google.com> 1431535012 -0700

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

Change-Id: I5c72c27ec055195d84c58d0699b46d3942c29dde