tree a0e8b44a301aecf7fa2dcb1a39116a198d68aaba
parent 74e85f18722ae6b6cf562352a3c30e49ae388e9d
parent bf9dcad78e1590957bcd304553098651911eb8e9
author Paul Lawrence <paullawrence@google.com> 1430255911 -0700
committer Paul Lawrence <paullawrence@google.com> 1430255949 -0700

resolved conflicts for merge of bf9dcad7 to mnc-dev-plus-aosp

Change-Id: Ic0d4ed7e6c83ad857e2a4a198d069b73fcf399e6