summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2015-09-03 04:26:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-03 04:26:42 +0000
commitd0390b5eac48b3d69a6bb595f60bf91592e89c38 (patch)
tree00fc86e73215b5d0b9e19656483e41aace4c3785
parent96f6ffd26e58557f7afc910a1d4f9086f8c5961d (diff)
parent3d56436e3fe563dc5d9a30670f69e82aa3786254 (diff)
downloaddeb-marshmallow-dr-release.tar.gz
Merge "Fix directory path for CarrierConfig overlay for deb." into mnc-devandroid-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11marshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-dev
-rw-r--r--overlay/packages/apps/CarrierConfig/res/xml/vendor.xml (renamed from overlay/packages/CarrierConfig/res/xml/vendor.xml)0
1 files changed, 0 insertions, 0 deletions
diff --git a/overlay/packages/CarrierConfig/res/xml/vendor.xml b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
index cfdd923..cfdd923 100644
--- a/overlay/packages/CarrierConfig/res/xml/vendor.xml
+++ b/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml