tree 39a484fc87e06f23e42a208404684b481b60be43
parent fd3d59718149dd8b0ca199b9759dc055a8ddd82c
parent 71f7d1ca2d21c74d4091c2b33abcd4ba527540b3
author hansson <hansson@google.com> 1519371407 +0000
committer android-build-merger <android-build-merger@google.com> 1519371407 +0000

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

Change-Id: I77939a9720058bab268e40d4be8622da308a40c1