tree c1e9c69766a1d60151e236a10f1a29aa8e765e0b
parent cdc187ee101996b9cb50461585b0bc53d7314fba
parent 0a2ed3f7615e57fb91ab79a9f6964518f5a1a590
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518653162 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518653162 +0000

[automerger] DO NOT MERGE Fix mTrustManager NPE am: a381c4ced3 am: 30a705874a am: 85727109f0 skipped: 15a3e59d35 am: 0a2ed3f761

Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c