[automerger skipped] Don't print :__pkg__ for package rules, since that's the...
[automerger skipped] Don't print :__pkg__ for package rules, since that's the default. am: 68e9d96d am: 760adcb8 -s ours am: f4624424 -s ours
am skip reason: Change-Id I0d2d86f00c3d38e603d6f58c4b1dd9a4170bf819 with SHA-1 01407c52 is in history
Change-Id: I893cd005d1f5de94ff147533e2f0b4b93a8748ef