OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9b729c c3080d7)
am c3080d78: am 841d7b75: am 52d3312a: Merge "Make ResourceKey always use non-null...
authorFilip Gruszczynski <gruszczy@google.com>
Tue, 4 Aug 2015 23:27:22 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 23:27:22 +0000 (23:27 +0000)
* commit 'c3080d7855838bcbe070bddd083a5736687f130b':
  Make ResourceKey always use non-null configuration override.


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