OSDN Git Service

resolved conflicts for merge of 9834af9c to stage-aosp-master
authorNarayan Kamath <narayan@google.com>
Wed, 29 Oct 2014 11:23:45 +0000 (11:23 +0000)
committerNarayan Kamath <narayan@google.com>
Wed, 29 Oct 2014 11:23:45 +0000 (11:23 +0000)
commitd3389e2f32478bba4eddff3b7b63e07b74008ea7
tree76032bfe380bdb8b7902e05741f058b80a0f2007
parentb27ea56312692c5ee0f38dad38e2a3832086b40a
parent9834af9ccf75b896c6bfbfec784055ac552759ad
resolved conflicts for merge of 9834af9c to stage-aosp-master

Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
core/java/android/net/Proxy.java