OSDN Git Service

(root) / android-x86 / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 62e30dc 332bbce)
am 332bbced: am a8d273d3: am bbe5f88e: Merge "Conditionally include the \'samplecode...
authorYing Wang <wangying@google.com>
Wed, 26 Feb 2014 20:15:01 +0000 (20:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Feb 2014 20:15:01 +0000 (20:15 +0000)
* commit '332bbced6d075eccdf54b00d4178afc59db6f096':
  Conditionally include the 'samplecode' rules.

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