tree e5218bfaeede11e8cfeabc1bc17a73ff1fdfd48b
parent b1825feac000e8d7999b0b956f104e989ea34d05
parent 91d2cbf44748ab40b8e4c52f28b7b5343d93e20e
author Bryce Lee <brycelee@google.com> 1435104411 -0700
committer Bryce Lee <brycelee@google.com> 1435104411 -0700

resolved conflicts for merge of 91d2cbf4 to mnc-dev

Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae