OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42f0127 4ae631f)
am 4ae631f4: am c11b5efa: Merge "Should have been included in 74e883d1415f68dc52a7e67...
authorJoe Onorato <joeo@google.com>
Thu, 26 Jul 2012 05:24:02 +0000 (22:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Jul 2012 05:24:02 +0000 (22:24 -0700)
* commit '4ae631f4560d383c28767641bb7e9e47ab175c7f':
  Should have been included in 74e883d1415f68dc52a7e679cd1ea1f486b8d8bb

1  2 
core/main.mk patch | diff1 | diff2 | blob | history

diff --cc core/main.mk
Simple merge
build
About OSDN
Find Software
Develop Software
Help