tree f71b21bba77303d7befb0fe6f8f9bf4ee55edab8
parent bae2f6902b21a7a67a4bfe74fa69ef17476f6f03
parent 4cd485f8e5ed9d7bc63d48542de6734e53536899
author Jeff Sharkey <jsharkey@google.com> 1523322552 -0700
committer android-build-merger <android-build-merger@google.com> 1523322552 -0700

Merge "API council requested tweaks to SubscriptionPlan." into pi-dev am: 5e0d360411
am: 4cd485f8e5

Change-Id: I5f3f1b04573a8a2286cf4d6456d7196fc5ed417d