summaryrefslogtreecommitdiffstats
path: root/core/java/overview.html
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-03-25 16:52:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-25 16:52:44 +0000
commit17badbaf83746244e21eaf41c5108f935b00c877 (patch)
tree720be086aac259e9e61b9ddb67ac7988e2a6e1d1 /core/java/overview.html
parenta223d658306fea5c0a6d30c9850058d5afadb2d1 (diff)
parent98ff619d79dd213b21e0cb468d6432f0b4e153b4 (diff)
downloadframeworks_base-17badbaf83746244e21eaf41c5108f935b00c877.zip
frameworks_base-17badbaf83746244e21eaf41c5108f935b00c877.tar.gz
frameworks_base-17badbaf83746244e21eaf41c5108f935b00c877.tar.bz2
am 98ff619d: am d4a2e7c4: am ff022cb1: Merge "Address pending comments for NetworkSecurityPolicy."
* commit '98ff619d79dd213b21e0cb468d6432f0b4e153b4': Address pending comments for NetworkSecurityPolicy.
Diffstat (limited to 'core/java/overview.html')
0 files changed, 0 insertions, 0 deletions