summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res/values-my-rMM
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-03-22 00:40:51 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-22 00:40:51 +0000
commitafa10ad39a7effd964d6afc83dab891e98856e1d (patch)
treea4cd8589a27f7cc5c52285e43e494c22cd874015 /packages/SystemUI/res/values-my-rMM
parentbb132be258d80422a8a3bee9401034a241db7142 (diff)
parent2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1 (diff)
downloadframeworks_base-afa10ad39a7effd964d6afc83dab891e98856e1d.zip
frameworks_base-afa10ad39a7effd964d6afc83dab891e98856e1d.tar.gz
frameworks_base-afa10ad39a7effd964d6afc83dab891e98856e1d.tar.bz2
am 2110a28a: am a4c4c575: Merge "Add android.security.NetworkSecurityPolicy."
* commit '2110a28a6c7ef7d7802028d0a2dd9c14ceb432e1': Add android.security.NetworkSecurityPolicy.
Diffstat (limited to 'packages/SystemUI/res/values-my-rMM')
0 files changed, 0 insertions, 0 deletions