tree b5fb050ecef07e3f2020513a526f6a99f46554c4
parent 66cac57064c302de82ebf9ff8e2183af2500aeb3
parent a58015e7e5dc2084eaace620d2b506ec3e12a7cf
author Sunny Goyal <sunnygoyal@google.com> 1527637179 -0700
committer android-build-merger <android-build-merger@google.com> 1527637179 -0700

[automerger skipped] Merge "Fixing wrong xml refenrece when the packageName is changed" am: 1179b71480
am: a58015e7e5  -s ours

Change-Id: I0f8f7e8366f367247506f16fb39be874a9496f2a