tree 7260f5ce17dff779b02ba3a3d8139815e9fb2322
parent ed7961eb5a1fceabf30a8f790c8dc37ae714db51
parent 44053b4ed3170cde4adde57c6d68537e2fe69d7d
author Andrew Solovay <asolovay@google.com> 1439831186 -0700
committer Andrew Solovay <asolovay@google.com> 1439831186 -0700

resolved conflicts for merge of 44053b4e to mnc-dev

Change-Id: Ibe58da3f0b18bce138b9d8880bccfe61ebc0b2cf