OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f402f8 4de86f8)
am 4de86f85: am f0d40256: am 6044798e: Merge "Allow getChangingConfigurations() on...
authorAlan Viverette <alanv@google.com>
Fri, 15 May 2015 22:59:42 +0000 (22:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 22:59:42 +0000 (22:59 +0000)
* commit '4de86f85f9ae6eaabc69600547b3b9dff5b6d879':
  Allow getChangingConfigurations() on DrawableWrapper with null drawable


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