tree deb7eddfdd435035c55346ddc6f971601d136c3c
parent 50ccbfd94ba83b72bb817e576b60f38a0015efcb
parent c9c2c45e694e7dd0cf1b2dc1a1c5c1a9a56c44c9
author John Shao <johnshao@google.com> 1482284395 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1482284395 +0000

Merge "Collapse AndroidManifest_common to default" into ub-contactsdialer-i-dev