tree b5fb050ecef07e3f2020513a526f6a99f46554c4
parent bb198b763c609128e705af4e18becc51e495642e
parent 74be875eb4f8ef9dcad885975f050c9793da4439
author Sunny Goyal <sunnygoyal@google.com> 1527641816 -0700
committer android-build-merger <android-build-merger@google.com> 1527641816 -0700

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

Change-Id: I5acfac8497372d0e42e9efaf6575d748de7480ec