OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e28fbd6 d754226)
am d7542263: (-s ours) am 155cf6c1: (-s ours) am 9918ffb0: Merge "CherryPick 988eeeb5...
authorXavier Ducrohet <xav@android.com>
Wed, 29 Jun 2011 01:58:23 +0000 (18:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jun 2011 01:58:23 +0000 (18:58 -0700)
* commit 'd7542263c6dfa2522e8844c7c714fbf2ad112385':
  CherryPick 988eeeb5 from hc-mr1. do not merge.


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