Android SDK ADT release 20
Merge "DO NOT MERGE Add webkit plumbing for file origin policy"