commit | 250548d516d657988d93161ab35791da97be5772 | [log] [tgz] |
---|---|---|
author | Abhilash Kumar Subhash <asubha@codeaurora.org> | Mon Jul 10 16:57:40 2017 +0530 |
committer | Abhilash Kumar Subhash <asubha@codeaurora.org> | Mon Jul 10 19:19:56 2017 +0530 |
tree | 03bdd56233a01aa643127d69bbeb3cf1432ddc17 | |
parent | 0c226b7921b421dd24363f15aefef1236aa25287 [diff] | |
parent | c3f642300e48179d69d773d431bb408a8f4062e1 [diff] |
Merge commit '6fa418fde74c6e2bb22c4d28602178efea7927b0' into remote Conflicts: base.mk device/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml Change-Id: Id3c174e34ea301bec6aed82f70f74f561272ea8e