Merge "Only persist last Shared Preferences state am: 31d6889f4c" into nyc-mr2-dev-plus-aosp

am: b152876f2d

Change-Id: I42ac3d40d2b082cf46bd6736eb6f4baf4cb1f72d
This commit is contained in:
Philip P. Moltmann
2016-12-14 18:40:54 +00:00
committed by android-build-merger

Diff Content Not Available