OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa7b61d 92c2fbd)
am 92c2fbd7: am 9ebb030a: am e5129d7f: Merge "Defer adding large icon until when...
authorWinson Chung <winsonc@google.com>
Tue, 15 Nov 2011 21:14:00 +0000 (13:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Nov 2011 21:14:00 +0000 (13:14 -0800)
* commit '92c2fbd704ea5093c103602574eefc78e923ad86':
  Defer adding large icon until when we compose the final notification. (Bug 5566846)


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