OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 805f583 e1891b7)
am e1891b79: Merge "resolved conflicts for merge of 2f2882a0 to master"
authorJean-Baptiste Queru <jbq@google.com>
Mon, 26 Sep 2011 20:25:58 +0000 (13:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Sep 2011 20:25:58 +0000 (13:25 -0700)
* commit 'e1891b79455842a794c17c93ce3a4a066076c802':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.


Trivial merge
build
About OSDN
Find Software
Develop Software
Help