OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 992ae88 841d7b7)
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)
* commit '841d7b75176f4ba086751f12ac57e5420ce501d8':
  Make ResourceKey always use non-null configuration override.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help