tree 03d749a52ac827aa9c589594fcbf389450cdc5ef
parent 363b273e9acc4307d3fbcb0bf3a09c1a1796ee4e
parent d57766c5b44d54143a9ad84211f8076f9da3fd4c
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518653167 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1518653167 +0000

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

Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c