tree 918c73f25e3f32735774619da8272adfe8ab9b79
parent 40b0d7990287df2e6b6348d0f11346ab2722bb83
parent 4ed56a25ea23c0a36cc6f05c9880fff86e3e18d5
author Vikram Aggarwal <viki@google.com> 1411676762 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1411676763 +0000

Merge "Prevent the inlining of ProviderConfig.AUTHORITY" into ub-now-master