summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChia-chi Yeh <chiachi@android.com>2012-06-12 12:59:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-12 12:59:59 -0700
commit7c727e50f1a73d6fab100af9cac3e16985aa18a2 (patch)
tree41e8686324fd86098b508084fdd16b27f920e465 /tools
parent82f47c95b638bfce0e51122617056138706bd57e (diff)
parenta2becffcf2a19889b90256a8479e276081ce6108 (diff)
downloadframeworks_base-7c727e50f1a73d6fab100af9cac3e16985aa18a2.zip
frameworks_base-7c727e50f1a73d6fab100af9cac3e16985aa18a2.tar.gz
frameworks_base-7c727e50f1a73d6fab100af9cac3e16985aa18a2.tar.bz2
am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
* commit 'a2becffcf2a19889b90256a8479e276081ce6108': VPN: move VpnDialogs away from system uid.
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions