OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d3311b 72a5a24)
am 5cf2a139: am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 15:45:51 +0000 (07:45 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Nov 2011 15:45:51 +0000 (07:45 -0800)
* commit '5cf2a1399e8cd047e84e159e25c74c259882f52c':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.


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