summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2013-08-28 07:45:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-28 07:45:07 -0700
commit647b6f5ed276bf93d95e5801e5e8af2802ef5fbb (patch)
tree50ca3d9e212cd488db4dac7fb7afc79395a69e9c /Android.mk
parent4315b3edb8975eab541f9f33367265caeaa05640 (diff)
parent59d234e71c4f3bf08d09a293305aac043550e840 (diff)
downloadframeworks_base-647b6f5ed276bf93d95e5801e5e8af2802ef5fbb.zip
frameworks_base-647b6f5ed276bf93d95e5801e5e8af2802ef5fbb.tar.gz
frameworks_base-647b6f5ed276bf93d95e5801e5e8af2802ef5fbb.tar.bz2
am 59d234e7: am 1f809c77: Merge "Don\'t clear Global Proxy on boot." into klp-dev
* commit '59d234e71c4f3bf08d09a293305aac043550e840': Don't clear Global Proxy on boot.
Diffstat (limited to 'Android.mk')
0 files changed, 0 insertions, 0 deletions