summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2014-08-23 00:12:49 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-23 00:12:49 +0000
commit577bf51765a64266dcd68ad8da0712599168b344 (patch)
treea8194d0b48958ace071ebcba2906275a68a0f75b /rs
parent4af63484357fb2f69b2506e66200708d2162d731 (diff)
parent8288c5b821532281d87f9ef881018074d2b3a327 (diff)
downloadframeworks_base-577bf51765a64266dcd68ad8da0712599168b344.zip
frameworks_base-577bf51765a64266dcd68ad8da0712599168b344.tar.gz
frameworks_base-577bf51765a64266dcd68ad8da0712599168b344.tar.bz2
am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev
* commit 'daf5448383a02017bb761841d675c3630ec94cac': Restore legacy VPN stats dialog strings.
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions