tree f02d4dd88aa19c3c45580e43489bbe7cea2af4b7
parent d5aef756813404d7c1f9fc2eb69c987be294e263
parent 9e831292f2e7ce3c8c98e43157b1d9e318ce884d
author hansson <hansson@google.com> 1519371054 +0000
committer android-build-merger <android-build-merger@google.com> 1519371054 +0000

Merge "packages/providers/CalendarProvider: Set LOCAL_SDK_VERSION where possible." am: ff030e8884
am: 9e831292f2

Change-Id: I79b6cf1fb54b21f09402eaf2a01f6a557618ee06