tree a18f057e4d1d84c4612c9ee27149d3c0462a1186
parent 96b2da271ffa18f1ecc7da57e6469ac01e0c2041
parent 8fc29cf1052fd951a3a0828b65506db30df89ece
author Jeff Sharkey <jsharkey@google.com> 1448931819 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1448931819 +0000

Merge "API to create SharedPreferences from File."