tree 939e8964dc4d176094805d064e5a7ac62a43b426
parent 15a72380b12016eb008ebf25c2846221d216feeb
parent 96cc486099b6bc342db50e575d27d8eb9f4c09f1
author Paul Stewart <pstew@google.com> 1465400188 +0000
committer android-build-merger <android-build-merger@google.com> 1465400188 +0000

Merge \\\"Perform a null-check in getMatchingConfig\\\" into mnc-dev am: e3c37daf73 am: e180938097
am: 96cc486099

Change-Id: Iae9d523d364079407f500d00f96db951c3d7f994