tree 49daa713b250679814e682fc9dc30bdbde39e827
parent 05e029710ca4d6d59d0ff82565a0c02346d66382
parent e3c37daf73bf7af0ac951834fabb079cba1e5b9b
author Paul Stewart <pstew@google.com> 1465399573 +0000
committer android-build-merger <android-build-merger@google.com> 1465399573 +0000

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

Change-Id: Ic33a155d3f19e39279a7d8b47ee63da217539c47