tree 799570e994d7eff2a41d756b1e8d45c5f5011934
parent 290ca6ec5c1f029bff7a43d1d499359e25a41904
parent 00859bd548215f154adaab51ab214bd0c9df9d7b
author Victor Chang <vichang@google.com> 1463764782 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463764782 +0000

Merge "Temp fix for NPE when race condition happens in TrustedCredentialsSettings" into nyc-dev