tree 917385d974dddfe4b0731c57bf58f1819a880a59
parent 791507db2293a4118b407e77b205b35cd95432f5
parent bd4b1bad48662057a44cdaaef3c0fc8c07739a31
author Andreas Gampe <agampe@google.com> 1512258889 +0000
committer android-build-merger <android-build-merger@google.com> 1512258889 +0000

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

Change-Id: I43c8231293f5e4349eaab6f4a8242892b3b2c726