tree 8140f05339e691942186248f982f8ba1252ecfa6
parent ca8e42a5896d7afdd9491d7c40afe34cae9acd22
parent 4f4220c1bd406cb1ae21e5e4e98ee654e518af43
author Jordan Liu <jminjie@google.com> 1479504888 +0000
committer android-build-merger <android-build-merger@google.com> 1479504888 +0000

Merge "Mark TelephonyProviderTest with @SmallTest" am: 613d5b36f0 am: f71c395c83 am: 5741c4afc6
am: 4f4220c1bd

Change-Id: I12dba00e12c70dd10942435fca82ca3767804e0c