tree 56ae2eebb33d1d84d349eca68836d1e8d01cfa12
parent 838a99e9adcdd065582956cac5150483535da4ae
parent c29791d56abbbbaef9786f5d25ecc6c32975bd9f
author Andreas Gampe <agampe@google.com> 1430155088 -0700
committer Andreas Gampe <agampe@google.com> 1430155088 -0700

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

Change-Id: I0e3dacbdfb68d6bb31800ff2e9969b96e63634b6