OSDN Git Service

am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration...
authorFilip Gruszczynski <gruszczy@google.com>
Tue, 4 Aug 2015 23:18:47 +0000 (23:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 23:18:47 +0000 (23:18 +0000)
commitc3080d7855838bcbe070bddd083a5736687f130b
treefa34802dcdf0ad2f960821a7d2d9682ebd5514ee
parent992ae880743a49331ea0ab666f4fe3c8617750db
parent841d7b75176f4ba086751f12ac57e5420ce501d8
am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

* commit '841d7b75176f4ba086751f12ac57e5420ce501d8':
  Make ResourceKey always use non-null configuration override.