tree 1c334f11e06ab22e7328a63305f294d5b1ebf6a6
parent 9b8f8602a74a943ddc356bb11c55b4998b2b386d
parent ab10e256df4f684260ca239905b1cec727181f6c
author Matt Sarett <msarett@google.com> 1440428807 -0400
committer Matt Sarett <msarett@google.com> 1440428807 -0400

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

Change-Id: I00359e276863bbb74d26f7c7a19bbef147717d14