Inferred the types for the Hashset and lists... Possibly nto necessary for JDK7, but AOSP needs ot be build in JDK6