tree df5785b46f8ced0f78fe4435623b63e2e8058780
parent 26ea647a4c411df4f44f536c88faef31f17e412b
parent c52d5f9f6190cf9a44dd6dfd3bc92386fbf023b3
author Antonio Cortes Perez <antoniocortes@google.com> 1486658122 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1486658122 +0000

Merge "Protecting VmsSubscriberManager with the future annotation and future flag."