tree 2283688ee3ba52d886fe2e32388b0b48bcbd4899
parent d6ebb55c62f56d71ed389fdc1dda1ef53e256347
parent 728ca235b5a8ec7953981bd69d6e9a33bf9e433a
author Jon Dormody <jond@google.com> 1512145013 +0000
committer android-build-merger <android-build-merger@google.com> 1512145013 +0000

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

Change-Id: Ib6d81f2355ef9d902725e2e1ee1cd5337f4294ad