Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff' * commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff': Instead of a raw AIDL interface, give DropBox a Java
Merge commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff' * commit '473bbd2140a2515a6a9a450ee955a790e0b6dcff': Instead of a raw AIDL interface, give DropBox a Java