Android S Beta 3
Merge "AOSP/Calendar - .java files deleted"