OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e146592 166055b)
am 166055b5: (-s ours) am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE...
authorJason Chen <jasonchen@google.com>
Wed, 2 Mar 2011 23:33:00 +0000 (15:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Mar 2011 23:33:00 +0000 (15:33 -0800)
* commit '166055b529987554644dc47cb5b29ce33a1ab5d1':
  Bugfixes in StaticLayout. DO NOT MERGE.


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