summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/VpnService.java
diff options
context:
space:
mode:
authorJungshik Jang <jayjang@google.com>2014-08-25 02:08:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-25 02:08:52 +0000
commitac0d62a1181bde3724f9a794cc4a96b2a4a90587 (patch)
treec673b407df1246af013fa2ebc405c2ed11e60ef2 /core/java/android/net/VpnService.java
parentb1e066bc27dc3ab7a619855336490c67994cb8a2 (diff)
parentf67113f7abd536cc3eb888344bf925762aa5278e (diff)
downloadframeworks_base-ac0d62a1181bde3724f9a794cc4a96b2a4a90587.zip
frameworks_base-ac0d62a1181bde3724f9a794cc4a96b2a4a90587.tar.gz
frameworks_base-ac0d62a1181bde3724f9a794cc4a96b2a4a90587.tar.bz2
Merge "Use common language code in hdmi service." into lmp-dev
Diffstat (limited to 'core/java/android/net/VpnService.java')
0 files changed, 0 insertions, 0 deletions