tree fbf9538935c010098325b1f9dfffc626acf91695
parent eb63393fdfc47ac9707ee6c46c627eebd616cc11
parent 06bc6945df4dd26b4f274d31c711dfb80846a613
author Andreas Gampe <agampe@google.com> 1512259504 +0000
committer android-build-merger <android-build-merger@google.com> 1512259504 +0000

Merge "Frameworks: Move SharedPreferencesImpl to Future" am: aa3e9d351e am: bd4b1bad48
am: 06bc6945df

Change-Id: I6f646b3e6b9fb9d47b44e3d35321202bbb3c502d