OSDN Git Service

Merge "Frameworks: Move SharedPreferencesImpl to tristate" am: 5edae415b0 am: 75dc3e9cf4
authorAndreas Gampe <agampe@google.com>
Fri, 12 Jan 2018 02:58:14 +0000 (02:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Jan 2018 02:58:14 +0000 (02:58 +0000)
am: 07903b8ded

Change-Id: Idbfd80b32c27cfd2d24b37b5b868820e6ed7a283


Trivial merge