[automerger skipped] AAPT2: Differentiate between Android and Java package names am: ef506c73bb

am: 5cc5fdd0dc  -s ours

Change-Id: Ie50856b30994185dbf5ff706349296efcac5d24d
This commit is contained in:
Adam Lesinski
2018-05-21 15:12:18 -07:00
committed by android-build-merger

Diff Content Not Available