OSDN Git Service

am d70c9d98: Merge "Add API definition for WebSettings.allowMixedContent"
authorBen Murdoch <benm@google.com>
Fri, 2 May 2014 15:51:02 +0000 (15:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 15:51:02 +0000 (15:51 +0000)
commitaf1019ffc2ce822771f7648e3baaec6130448e26
tree03c7e020400bbd08a4cff6da6b3cf4cc21f5a8b3
parent8319d99a346f53774fa7cbb51ed1fea4383e6a4c
parent27ecb35b1970b114dc82d01a58386ca4e57e72ab
am d70c9d98: Merge "Add API definition for WebSettings.allowMixedContent"

* commit 'd70c9d98771c950ef63e5c1c0fbe789043e5698f':
  Add API definition for WebSettings.allowMixedContent
api/current.txt