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

am: a58015e7e5  -s ours

Change-Id: I0f8f7e8366f367247506f16fb39be874a9496f2a
This commit is contained in:
Sunny Goyal authored and android-build-merger committed 2018-05-29 16:39:39 -07:00
commit 74be875eb4

Diff Content Not Available