tree c09ec2f08e8824766a749267e1b36162fa0c6c2f
parent 719e8b54126867dc8250ec40306b75b10e00915e
parent fb839ce59aeaf0bc2774091c3b7004a93f224d05
author Jon Dormody <jond@google.com> 1512144447 +0000
committer android-build-merger <android-build-merger@google.com> 1512144447 +0000

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

Change-Id: Ic135f510c6e5ff8a9a00f2d2be1fcc0c284dd5cf