commit | 71f50bee1fe952edce635fa7744cd873b924c4f5 | [log] [tgz] |
---|---|---|
author | Abhilash Kumar Subhash <asubha@codeaurora.org> | Mon Jul 24 19:52:30 2017 +0530 |
committer | Abhilash Kumar Subhash <asubha@codeaurora.org> | Mon Jul 24 19:52:30 2017 +0530 |
tree | e11007bfbd0500a11e5a8033a8b5d87ba672edec | |
parent | 3e1eb14a256e1dcf42ea7040ab7b48a620df3cec [diff] | |
parent | cd639c3a416f37e5fc236b91ce70b1e5381059cb [diff] |
Merge commit 'a308eec4e6f768e96d5c2ac662742a0ce6780ddb' into remote Conflicts: device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml rootdir/etc/init.qcom.rc Change-Id: I0bf3d3bad8a8ee9f8e608ef46664dc4172fe0275