tree e7066359675a4d0990dc1dc1b6d8015def9f79e1
parent 56adf8347aedcd8d2fa58aecfe043534e3d1ad90
author John Shao <johnshao@google.com> 1482282723 -0800
committer John Shao <johnshao@google.com> 1482283647 -0800

Collapse AndroidManifest_common to default

Remove the _common manifest because it is nonstandard
and errorprone and instead do a manual merge with the existing
common manifest with the Contacts manifest as the default for
overlay.

Test: built Contacts

Bug: 33665712
Change-Id: If3ecf12c4ce671c176ef2ddcfddf112cf29da9bc