OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51b8edb f8a7ff1)
am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp
authorYing Wang <wangying@google.com>
Thu, 10 Mar 2011 01:05:10 +0000 (17:05 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 10 Mar 2011 01:05:10 +0000 (17:05 -0800)
* commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e':
  Dist build.prop in sdk builds.


Trivial merge
build
About OSDN
Find Software
Develop Software
Help