tree 59e3ae548b3c17480d60b55d6376b3a5ce4a6f15
parent 5a590c68df929065a010d3f1906da5f5055a4435
parent 7db4a90e60a7069013ac44abe5fd88bab17bef5d
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518653176 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518653176 +0000

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

Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753