tree d103878f4b21cf3c4b53c556f630cfa4ff6db117
parent 9020d22c6d51ca798efd634aead72c2217da9584
parent 37db2694eb6f345958db1a99f64f141aa06a13db
author Jon Dormody <jond@google.com> 1512145709 +0000
committer android-build-merger <android-build-merger@google.com> 1512145709 +0000

Merge "Docs: Added mention that the getSharedPreferences method is thread safe." into oc-dev am: fb839ce59a am: 728ca235b5
am: 37db2694eb

Change-Id: I98151cf907cd2f635c8f4a0e128ff697024b3a54